Changeset 347 for cpp/frams

Timestamp:

04/07/15 04:20:53 (10 years ago)

Author:

Maciej Komosinski

Message:

Using memmove instead of memcpy because overlapping source/destination can happen in SString copy/append

File:

• cpp/frams/util/sstring.cpp (modified) (5 diffs)

cpp/frams/util/sstring.cpp

@@ -80 +80 @@
 if (chlen<size)
         {
-        memcpy(txt,ch,chlen);
+        memmove(txt,ch,chlen);
         }
 else
@@ -97 +97 @@
 void SBuf::append(const char *ch,int chlen)
 { // doesn't check anything!
-memcpy(txt+used,ch,chlen);
+memmove(txt+used,ch,chlen);
 used+=chlen;
 txt[used]=0;
@@ -108 +108 @@
 txt=(char*)realloc(txt,needed+1);
 size=needed;
-}
-
-//////////////////////////////////////////////////
-// to be moved somewhere else?
-// public domain source: http://isthe.com/chongo/src/fnv
-typedef uint32_t Fnv32_t;
-
-#define FNV_32_PRIME ((Fnv32_t)0x01000193)
-#define FNV1_32_INIT ((Fnv32_t)0x811c9dc5)
-#define FNV1_32A_INIT FNV1_32_INIT
-
-Fnv32_t fnv_32a_buf(void *buf, size_t len, Fnv32_t hval)
-{
-    unsigned char *bp = (unsigned char *)buf;   /* start of buffer */
-    unsigned char *be = bp + len;               /* beyond end of buffer */
-
-    while (bp < be) {
-
-        /* xor the bottom with the current octet */
-        hval ^= (Fnv32_t)*bp++;
-
-        /* multiply by the 32 bit FNV magic prime mod 2^32 */
-#if defined(NO_FNV_GCC_OPTIMIZATION)
-        hval *= FNV_32_PRIME;
-#else
-        hval += (hval<<1) + (hval<<4) + (hval<<7) + (hval<<8) + (hval<<24);
-#endif
-
-    }
-
-    /* return our new hash value */
-    return hval;
-}
-//////////////////////////////////////////////////
-
-uint32_t SBuf::hash() const
-{
-return fnv_32a_buf(txt,used,FNV1_32A_INIT);
 }
 
@@ -308 +270 @@
 detachEmpty(chlen);
 REF_UNLOCK;
-memcpy(buf->txt,ch,chlen);
+memmove(buf->txt,ch,chlen);
 buf->txt[chlen]=0; buf->used=chlen;
 }
@@ -463 +425 @@
 
 #endif //#ifdef SSTRING_SIMPLE
+
+//////////////////////////////////////////////////
+// to be moved somewhere else?
+// public domain source: http://isthe.com/chongo/src/fnv
+typedef uint32_t Fnv32_t;
+
+#define FNV_32_PRIME ((Fnv32_t)0x01000193)
+#define FNV1_32_INIT ((Fnv32_t)0x811c9dc5)
+#define FNV1_32A_INIT FNV1_32_INIT
+
+Fnv32_t fnv_32a_buf(void *buf, size_t len, Fnv32_t hval)
+{
+    unsigned char *bp = (unsigned char *)buf;   /* start of buffer */
+    unsigned char *be = bp + len;               /* beyond end of buffer */
+
+    while (bp < be) {
+
+        /* xor the bottom with the current octet */
+        hval ^= (Fnv32_t)*bp++;
+
+        /* multiply by the 32 bit FNV magic prime mod 2^32 */
+#if defined(NO_FNV_GCC_OPTIMIZATION)
+        hval *= FNV_32_PRIME;
+#else
+        hval += (hval<<1) + (hval<<4) + (hval<<7) + (hval<<8) + (hval<<24);
+#endif
+
+    }
+
+    /* return our new hash value */
+    return hval;
+}
+//////////////////////////////////////////////////
+
+#ifdef SSTRING_SIMPLE
+uint32_t SString::hash() const
+{
+return fnv_32a_buf(txt,used,FNV1_32A_INIT);
+}
+#else
+uint32_t SBuf::hash() const
+{
+return fnv_32a_buf(txt,used,FNV1_32A_INIT);
+}
+#endif