aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLRN <lrn1986@gmail.com>2013-09-07 16:19:14 +0000
committerLRN <lrn1986@gmail.com>2013-09-07 16:19:14 +0000
commitcddc39a68ea310659449377c6ce12d0e0c38a739 (patch)
treeddc659f831338f6e008ec1ad57b62511ec506248
parent4b758f2466475094a019d72934458dc4ceca83dd (diff)
downloadgnunet-cddc39a68ea310659449377c6ce12d0e0c38a739.tar.gz
gnunet-cddc39a68ea310659449377c6ce12d0e0c38a739.zip
Fix memory allocation in set service
-rw-r--r--src/set/gnunet-service-set_intersection.c2
-rw-r--r--src/set/gnunet-service-set_union.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c
index 1215a4783..2a1cf634b 100644
--- a/src/set/gnunet-service-set_intersection.c
+++ b/src/set/gnunet-service-set_intersection.c
@@ -1039,7 +1039,7 @@ handle_p2p_elements (void *cls, const struct GNUNET_MessageHeader *mh)
1039 return; 1039 return;
1040 } 1040 }
1041 element_size = ntohs (mh->size) - sizeof (struct GNUNET_MessageHeader); 1041 element_size = ntohs (mh->size) - sizeof (struct GNUNET_MessageHeader);
1042 ee = GNUNET_malloc (sizeof *eo + element_size); 1042 ee = GNUNET_malloc (sizeof *ee + element_size);
1043 memcpy (&ee[1], &mh[1], element_size); 1043 memcpy (&ee[1], &mh[1], element_size);
1044 ee->element.data = &ee[1]; 1044 ee->element.data = &ee[1];
1045 ee->remote = GNUNET_YES; 1045 ee->remote = GNUNET_YES;
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index edcf389fa..7e7bddf79 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -1027,7 +1027,7 @@ handle_p2p_elements (void *cls, const struct GNUNET_MessageHeader *mh)
1027 return; 1027 return;
1028 } 1028 }
1029 element_size = ntohs (mh->size) - sizeof (struct GNUNET_MessageHeader); 1029 element_size = ntohs (mh->size) - sizeof (struct GNUNET_MessageHeader);
1030 ee = GNUNET_malloc (sizeof *eo + element_size); 1030 ee = GNUNET_malloc (sizeof *ee + element_size);
1031 memcpy (&ee[1], &mh[1], element_size); 1031 memcpy (&ee[1], &mh[1], element_size);
1032 ee->element.size = element_size; 1032 ee->element.size = element_size;
1033 ee->element.data = &ee[1]; 1033 ee->element.data = &ee[1];