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_client.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_client.c')
-rw-r--r-- | src/transport/plugin_transport_http_client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index 132406799..4e0cde998 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c | |||
@@ -681,7 +681,7 @@ client_log (CURL *curl, | |||
681 | ttype = "UNSPECIFIED"; | 681 | ttype = "UNSPECIFIED"; |
682 | break; | 682 | break; |
683 | } | 683 | } |
684 | memcpy (text, data, size); | 684 | GNUNET_memcpy (text, data, size); |
685 | if (text[size - 1] == '\n') | 685 | if (text[size - 1] == '\n') |
686 | { | 686 | { |
687 | text[size] = '\0'; | 687 | text[size] = '\0'; |
@@ -774,7 +774,7 @@ http_client_plugin_send (void *cls, | |||
774 | msg->buf = (char *) &msg[1]; | 774 | msg->buf = (char *) &msg[1]; |
775 | msg->transmit_cont = cont; | 775 | msg->transmit_cont = cont; |
776 | msg->transmit_cont_cls = cont_cls; | 776 | msg->transmit_cont_cls = cont_cls; |
777 | memcpy (msg->buf, | 777 | GNUNET_memcpy (msg->buf, |
778 | msgbuf, | 778 | msgbuf, |
779 | msgbuf_size); | 779 | msgbuf_size); |
780 | GNUNET_CONTAINER_DLL_insert_tail (s->msg_head, | 780 | GNUNET_CONTAINER_DLL_insert_tail (s->msg_head, |
@@ -1071,7 +1071,7 @@ client_send_cb (void *stream, | |||
1071 | /* calculate how much fits in buffer */ | 1071 | /* calculate how much fits in buffer */ |
1072 | len = GNUNET_MIN (msg->size - msg->pos, | 1072 | len = GNUNET_MIN (msg->size - msg->pos, |
1073 | size * nmemb); | 1073 | size * nmemb); |
1074 | memcpy (stream, &msg->buf[msg->pos], len); | 1074 | GNUNET_memcpy (stream, &msg->buf[msg->pos], len); |
1075 | msg->pos += len; | 1075 | msg->pos += len; |
1076 | if (msg->pos == msg->size) | 1076 | if (msg->pos == msg->size) |
1077 | { | 1077 | { |