[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: fix #6154
From: |
gnunet |
Subject: |
[gnunet] branch master updated: fix #6154 |
Date: |
Fri, 03 Apr 2020 14:23:40 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 175303b44 fix #6154
new 1b5dfc396 Merge branch 'master' of git+ssh://gnunet.org/gnunet
175303b44 is described below
commit 175303b445903df39e0ba769820a6768352ccac4
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Apr 3 14:18:58 2020 +0200
fix #6154
---
src/util/strings.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/util/strings.c b/src/util/strings.c
index f32c3ea61..54a594c51 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -62,25 +62,25 @@
* (or number of bytes that would have been written)
*/
size_t
-GNUNET_STRINGS_buffer_fill (char *buffer, size_t size, unsigned int count, ...)
+GNUNET_STRINGS_buffer_fill (char *buffer,
+ size_t size,
+ unsigned int count, ...)
{
size_t needed;
- size_t slen;
- const char *s;
va_list ap;
needed = 0;
va_start (ap, count);
while (count > 0)
{
- s = va_arg (ap, const char *);
-
- slen = strlen (s) + 1;
- if (buffer != NULL)
- {
- GNUNET_assert (needed + slen <= size);
- GNUNET_memcpy (&buffer[needed], s, slen);
- }
+ const char *s = va_arg (ap, const char *);
+ size_t slen = strlen (s) + 1;
+
+ GNUNET_assert (slen <= size - needed);
+ if (NULL != buffer)
+ GNUNET_memcpy (&buffer[needed],
+ s,
+ slen);
needed += slen;
count--;
}
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: fix #6154,
gnunet <=