aboutsummaryrefslogtreecommitdiff
path: root/src/core/gnunet-service-core_sessions.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-07-08 17:20:23 +0000
committerChristian Grothoff <christian@grothoff.org>2016-07-08 17:20:23 +0000
commitd8c53b12a818ff7cf82d06a1a69c395bdef85ee6 (patch)
tree0ebb0db416c157fcfde51a941185819dd12d51fd /src/core/gnunet-service-core_sessions.c
parent5184c17d32a39c928c2a0fec3ee1ad098bbaa562 (diff)
downloadgnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.tar.gz
gnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.zip
-avoid calling memcpy() with NULL argument, even if len is 0
Diffstat (limited to 'src/core/gnunet-service-core_sessions.c')
-rw-r--r--src/core/gnunet-service-core_sessions.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c
index 0a547be1b..41d3cc24b 100644
--- a/src/core/gnunet-service-core_sessions.c
+++ b/src/core/gnunet-service-core_sessions.c
@@ -747,7 +747,7 @@ try_transmission (struct Session *session)
747 while ( (NULL != (pos = session->sme_head)) && 747 while ( (NULL != (pos = session->sme_head)) &&
748 (used + pos->size <= msize) ) 748 (used + pos->size <= msize) )
749 { 749 {
750 memcpy (&pbuf[used], &pos[1], pos->size); 750 GNUNET_memcpy (&pbuf[used], &pos[1], pos->size);
751 used += pos->size; 751 used += pos->size;
752 GNUNET_CONTAINER_DLL_remove (session->sme_head, 752 GNUNET_CONTAINER_DLL_remove (session->sme_head,
753 session->sme_tail, 753 session->sme_tail,
@@ -797,7 +797,7 @@ do_restart_typemap_message (void *cls,
797 797
798 size = ntohs (hdr->size); 798 size = ntohs (hdr->size);
799 sme = GNUNET_malloc (sizeof (struct SessionMessageEntry) + size); 799 sme = GNUNET_malloc (sizeof (struct SessionMessageEntry) + size);
800 memcpy (&sme[1], hdr, size); 800 GNUNET_memcpy (&sme[1], hdr, size);
801 sme->size = size; 801 sme->size = size;
802 sme->priority = GNUNET_CORE_PRIO_CRITICAL_CONTROL; 802 sme->priority = GNUNET_CORE_PRIO_CRITICAL_CONTROL;
803 GNUNET_CONTAINER_DLL_insert (session->sme_head, 803 GNUNET_CONTAINER_DLL_insert (session->sme_head,
@@ -871,7 +871,7 @@ GSC_SESSIONS_transmit (struct GSC_ClientActiveRequest *car,
871 return; 871 return;
872 msize = ntohs (msg->size); 872 msize = ntohs (msg->size);
873 sme = GNUNET_malloc (sizeof (struct SessionMessageEntry) + msize); 873 sme = GNUNET_malloc (sizeof (struct SessionMessageEntry) + msize);
874 memcpy (&sme[1], msg, msize); 874 GNUNET_memcpy (&sme[1], msg, msize);
875 sme->size = msize; 875 sme->size = msize;
876 sme->priority = priority; 876 sme->priority = priority;
877 if (GNUNET_YES == cork) 877 if (GNUNET_YES == cork)