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_smtp.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_smtp.c')
-rw-r--r-- | src/transport/plugin_transport_smtp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/transport/plugin_transport_smtp.c b/src/transport/plugin_transport_smtp.c index 0ccf3f7bf..876f81ce3 100644 --- a/src/transport/plugin_transport_smtp.c +++ b/src/transport/plugin_transport_smtp.c | |||
@@ -325,7 +325,7 @@ api_create_hello () | |||
325 | haddr = (EmailAddress *) &msg[1]; | 325 | haddr = (EmailAddress *) &msg[1]; |
326 | memset (&haddr->filter[0], 0, FILTER_STRING_SIZE); | 326 | memset (&haddr->filter[0], 0, FILTER_STRING_SIZE); |
327 | strcpy (&haddr->filter[0], filter); | 327 | strcpy (&haddr->filter[0], filter); |
328 | memcpy (&haddr->senderAddress[0], email, strlen (email) + 1); | 328 | GNUNET_memcpy (&haddr->senderAddress[0], email, strlen (email) + 1); |
329 | msg->senderAddressSize = htons (strlen (email) + 1 + sizeof (EmailAddress)); | 329 | msg->senderAddressSize = htons (strlen (email) + 1 + sizeof (EmailAddress)); |
330 | msg->protocol = htons (GNUNET_TRANSPORT_PROTOCOL_NUMBER_SMTP); | 330 | msg->protocol = htons (GNUNET_TRANSPORT_PROTOCOL_NUMBER_SMTP); |
331 | msg->MTU = htonl (smtpAPI.mtu); | 331 | msg->MTU = htonl (smtpAPI.mtu); |
@@ -463,7 +463,7 @@ api_send (GNUNET_TSession * tsession, const void *msg, const unsigned int size, | |||
463 | } | 463 | } |
464 | GNUNET_free (filter); | 464 | GNUNET_free (filter); |
465 | m = GNUNET_malloc (size + sizeof (SMTPMessage)); | 465 | m = GNUNET_malloc (size + sizeof (SMTPMessage)); |
466 | memcpy (m, msg, size); | 466 | GNUNET_memcpy (m, msg, size); |
467 | mp = (SMTPMessage *) &m[size]; | 467 | mp = (SMTPMessage *) &m[size]; |
468 | mp->header.size = htons (size + sizeof (SMTPMessage)); | 468 | mp->header.size = htons (size + sizeof (SMTPMessage)); |
469 | mp->header.type = htons (0); | 469 | mp->header.type = htons (0); |
@@ -544,7 +544,7 @@ api_connect (const GNUNET_MessageHello * hello, GNUNET_TSession ** tsessionPtr, | |||
544 | tsession = GNUNET_new (GNUNET_TSession); | 544 | tsession = GNUNET_new (GNUNET_TSession); |
545 | tsession->internal = GNUNET_malloc (GNUNET_sizeof_hello (hello)); | 545 | tsession->internal = GNUNET_malloc (GNUNET_sizeof_hello (hello)); |
546 | tsession->peer = hello->senderIdentity; | 546 | tsession->peer = hello->senderIdentity; |
547 | memcpy (tsession->internal, hello, GNUNET_sizeof_hello (hello)); | 547 | GNUNET_memcpy (tsession->internal, hello, GNUNET_sizeof_hello (hello)); |
548 | tsession->ttype = smtpAPI.protocol_number; | 548 | tsession->ttype = smtpAPI.protocol_number; |
549 | (*tsessionPtr) = tsession; | 549 | (*tsessionPtr) = tsession; |
550 | return GNUNET_OK; | 550 | return GNUNET_OK; |