aboutsummaryrefslogtreecommitdiff
path: root/src/util/service.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/util/service.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/util/service.c')
-rw-r--r--src/util/service.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/util/service.c b/src/util/service.c
index bdef17361..3beb4a085 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -756,7 +756,7 @@ GNUNET_SERVICE_get_server_addresses (const char *service_name,
756 GNUNET_assert (sizeof (struct sockaddr_in) == pos->ai_addrlen); 756 GNUNET_assert (sizeof (struct sockaddr_in) == pos->ai_addrlen);
757 saddrlens[i] = pos->ai_addrlen; 757 saddrlens[i] = pos->ai_addrlen;
758 saddrs[i] = GNUNET_malloc (saddrlens[i]); 758 saddrs[i] = GNUNET_malloc (saddrlens[i]);
759 memcpy (saddrs[i], pos->ai_addr, saddrlens[i]); 759 GNUNET_memcpy (saddrs[i], pos->ai_addr, saddrlens[i]);
760 ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port); 760 ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
761 } 761 }
762 else 762 else
@@ -765,7 +765,7 @@ GNUNET_SERVICE_get_server_addresses (const char *service_name,
765 GNUNET_assert (sizeof (struct sockaddr_in6) == pos->ai_addrlen); 765 GNUNET_assert (sizeof (struct sockaddr_in6) == pos->ai_addrlen);
766 saddrlens[i] = pos->ai_addrlen; 766 saddrlens[i] = pos->ai_addrlen;
767 saddrs[i] = GNUNET_malloc (saddrlens[i]); 767 saddrs[i] = GNUNET_malloc (saddrlens[i]);
768 memcpy (saddrs[i], pos->ai_addr, saddrlens[i]); 768 GNUNET_memcpy (saddrs[i], pos->ai_addr, saddrlens[i]);
769 ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port); 769 ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port);
770 } 770 }
771 i++; 771 i++;
@@ -1191,7 +1191,7 @@ service_task (void *cls)
1191 sctx); 1191 sctx);
1192 } 1192 }
1193 sctx->my_handlers = GNUNET_malloc (sizeof (defhandlers)); 1193 sctx->my_handlers = GNUNET_malloc (sizeof (defhandlers));
1194 memcpy (sctx->my_handlers, defhandlers, sizeof (defhandlers)); 1194 GNUNET_memcpy (sctx->my_handlers, defhandlers, sizeof (defhandlers));
1195 i = 0; 1195 i = 0;
1196 while (NULL != sctx->my_handlers[i].callback) 1196 while (NULL != sctx->my_handlers[i].callback)
1197 sctx->my_handlers[i++].callback_cls = sctx; 1197 sctx->my_handlers[i++].callback_cls = sctx;
@@ -1603,7 +1603,7 @@ GNUNET_SERVICE_start (const char *service_name,
1603 sctx->match_gid); 1603 sctx->match_gid);
1604#endif 1604#endif
1605 sctx->my_handlers = GNUNET_malloc (sizeof (defhandlers)); 1605 sctx->my_handlers = GNUNET_malloc (sizeof (defhandlers));
1606 memcpy (sctx->my_handlers, defhandlers, sizeof (defhandlers)); 1606 GNUNET_memcpy (sctx->my_handlers, defhandlers, sizeof (defhandlers));
1607 i = 0; 1607 i = 0;
1608 while ((sctx->my_handlers[i].callback != NULL)) 1608 while ((sctx->my_handlers[i].callback != NULL))
1609 sctx->my_handlers[i++].callback_cls = sctx; 1609 sctx->my_handlers[i++].callback_cls = sctx;