diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-29 11:11:16 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-29 11:11:16 -0700 |
| commit | b4fcf2ee60d3f18df13b4899b4572f5fd9b55c33 (patch) | |
| tree | ce0446aafe5bc7a9412b4f2adfe20848bc571e9e | |
| parent | d9eacd1616ddd8c601f74f8bb9f11c56cf208bd5 (diff) | |
| download | infinitytier-b4fcf2ee60d3f18df13b4899b4572f5fd9b55c33.tar.gz infinitytier-b4fcf2ee60d3f18df13b4899b4572f5fd9b55c33.zip | |
Fix a valgrind warning.
| -rw-r--r-- | node/Dictionary.hpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/node/Dictionary.hpp b/node/Dictionary.hpp index ecad4df0..e6501bfe 100644 --- a/node/Dictionary.hpp +++ b/node/Dictionary.hpp @@ -66,8 +66,10 @@ public: Dictionary(const char *s,unsigned int len) { - memcpy(_d,s,(len > C) ? (unsigned int)C : len); - _d[C-1] = (char)0; + if (len > C) + len = C; + memcpy(_d,s,len); + _d[len-1] = (char)0; } Dictionary(const Dictionary &d) @@ -161,7 +163,7 @@ public: j = 0; esc = false; ++p; - while ((*p)&&(*p != '\r')&&(*p != '\n')) { + while ((*p != 0)&&(*p != '\r')&&(*p != '\n')) { if (esc) { esc = false; switch(*p) { @@ -308,7 +310,7 @@ public: p = value; int k = 0; - while ( ((*p)&&(vlen < 0)) || (k < vlen) ) { + while ( ((vlen < 0)&&(*p)) || (k < vlen) ) { switch(*p) { case 0: case '\r': |