diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-07-08 17:20:23 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-07-08 17:20:23 +0000 |
commit | d8c53b12a818ff7cf82d06a1a69c395bdef85ee6 (patch) | |
tree | 0ebb0db416c157fcfde51a941185819dd12d51fd /src/transport/plugin_transport_http_server.c | |
parent | 5184c17d32a39c928c2a0fec3ee1ad098bbaa562 (diff) | |
download | gnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.tar.gz gnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.zip |
-avoid calling memcpy() with NULL argument, even if len is 0
Diffstat (limited to 'src/transport/plugin_transport_http_server.c')
-rw-r--r-- | src/transport/plugin_transport_http_server.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index 2baff35bf..96f79e482 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c | |||
@@ -738,7 +738,7 @@ http_server_plugin_send (void *cls, | |||
738 | msg->buf = (char *) &msg[1]; | 738 | msg->buf = (char *) &msg[1]; |
739 | msg->transmit_cont = cont; | 739 | msg->transmit_cont = cont; |
740 | msg->transmit_cont_cls = cont_cls; | 740 | msg->transmit_cont_cls = cont_cls; |
741 | memcpy (msg->buf, | 741 | GNUNET_memcpy (msg->buf, |
742 | msgbuf, | 742 | msgbuf, |
743 | msgbuf_size); | 743 | msgbuf_size); |
744 | GNUNET_CONTAINER_DLL_insert_tail (session->msg_head, | 744 | GNUNET_CONTAINER_DLL_insert_tail (session->msg_head, |
@@ -1554,7 +1554,7 @@ server_send_callback (void *cls, | |||
1554 | /* sending */ | 1554 | /* sending */ |
1555 | bytes_read = GNUNET_MIN (msg->size - msg->pos, | 1555 | bytes_read = GNUNET_MIN (msg->size - msg->pos, |
1556 | max); | 1556 | max); |
1557 | memcpy (buf, &msg->buf[msg->pos], bytes_read); | 1557 | GNUNET_memcpy (buf, &msg->buf[msg->pos], bytes_read); |
1558 | msg->pos += bytes_read; | 1558 | msg->pos += bytes_read; |
1559 | 1559 | ||
1560 | /* removing message */ | 1560 | /* removing message */ |
@@ -2650,7 +2650,7 @@ server_get_addresses (struct HTTP_Server_Plugin *plugin, | |||
2650 | GNUNET_assert (pos->ai_addrlen == sizeof (struct sockaddr_in)); | 2650 | GNUNET_assert (pos->ai_addrlen == sizeof (struct sockaddr_in)); |
2651 | saddrlens[i] = pos->ai_addrlen; | 2651 | saddrlens[i] = pos->ai_addrlen; |
2652 | saddrs[i] = GNUNET_malloc (saddrlens[i]); | 2652 | saddrs[i] = GNUNET_malloc (saddrlens[i]); |
2653 | memcpy (saddrs[i], pos->ai_addr, saddrlens[i]); | 2653 | GNUNET_memcpy (saddrs[i], pos->ai_addr, saddrlens[i]); |
2654 | ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port); | 2654 | ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port); |
2655 | } | 2655 | } |
2656 | else | 2656 | else |
@@ -2659,7 +2659,7 @@ server_get_addresses (struct HTTP_Server_Plugin *plugin, | |||
2659 | GNUNET_assert (pos->ai_addrlen == sizeof (struct sockaddr_in6)); | 2659 | GNUNET_assert (pos->ai_addrlen == sizeof (struct sockaddr_in6)); |
2660 | saddrlens[i] = pos->ai_addrlen; | 2660 | saddrlens[i] = pos->ai_addrlen; |
2661 | saddrs[i] = GNUNET_malloc (saddrlens[i]); | 2661 | saddrs[i] = GNUNET_malloc (saddrlens[i]); |
2662 | memcpy (saddrs[i], pos->ai_addr, saddrlens[i]); | 2662 | GNUNET_memcpy (saddrs[i], pos->ai_addr, saddrlens[i]); |
2663 | ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port); | 2663 | ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port); |
2664 | } | 2664 | } |
2665 | i++; | 2665 | i++; |
@@ -2852,7 +2852,7 @@ server_notify_external_hostname (void *cls) | |||
2852 | ext_addr->options = htonl (plugin->options); | 2852 | ext_addr->options = htonl (plugin->options); |
2853 | ext_addr->urlen = htonl (urlen); | 2853 | ext_addr->urlen = htonl (urlen); |
2854 | ext_addr_len = sizeof (struct HttpAddress) + urlen; | 2854 | ext_addr_len = sizeof (struct HttpAddress) + urlen; |
2855 | memcpy (&ext_addr[1], url, urlen); | 2855 | GNUNET_memcpy (&ext_addr[1], url, urlen); |
2856 | GNUNET_free (url); | 2856 | GNUNET_free (url); |
2857 | 2857 | ||
2858 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2858 | LOG (GNUNET_ERROR_TYPE_DEBUG, |