diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2008-01-07 20:44:32 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2008-01-07 20:44:32 +0000 |
| commit | e14c70310662051c8f266136a4f08c568321f8ca (patch) | |
| tree | 607716f5e0048b85a7d82ccf920c2df513fc3888 /epan/emem.c | |
| parent | 6bcc12eabb0d7680389cc1b5e063a5c76c20924c (diff) | |
From Jim Young (bug 2162):
Patch for epan/emem.c functions ep_strndup() and se_strndup() to stop valgrind
message "invalid read of size 1".
svn path=/trunk/; revision=24023
Diffstat (limited to 'epan/emem.c')
| -rw-r--r-- | epan/emem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/emem.c b/epan/emem.c index 2b22878dfc..44ecfae263 100644 --- a/epan/emem.c +++ b/epan/emem.c @@ -512,7 +512,7 @@ gchar* ep_strndup(const gchar* src, size_t len) { gchar* dst = ep_alloc(len+1); guint i; - for (i = 0; src[i] && i < len; i++) + for (i = 0; (i < len) && src[i]; i++) dst[i] = src[i]; dst[i] = '\0'; @@ -654,7 +654,7 @@ gchar* se_strndup(const gchar* src, size_t len) { gchar* dst = se_alloc(len+1); guint i; - for (i = 0; src[i] && i < len; i++) + for (i = 0; (i < len) && src[i]; i++) dst[i] = src[i]; dst[i] = '\0'; |