Changeset 8478

Timestamp:

May 22, 2009, 5:35:51 AM (14 years ago)

Author:

charles

Message:

(trunk) dht seems to be crashing in bcmp() on the mac, so I suspect the homegrown implementation of memmem() is buggy... test this out by replacing memmem()'s implementation

Location:

trunk

Files:

• libtransmission/utils-test.c (modified) (2 diffs)
• libtransmission/utils.c (modified) (1 diff)
• third-party/dht/dht.c (modified) (1 diff)

trunk/libtransmission/utils-test.c

@@ -226 +226 @@
 }
 
+static int
+test_memmem( void )
+{
+    char const haystack[12] = "abcabcabcabc";
+    char const needle[3] = "cab";
+
+    check( tr_memmem( haystack, sizeof haystack, haystack, sizeof haystack) == haystack )
+    check( tr_memmem( haystack, sizeof haystack, needle, sizeof needle) == haystack + 2 )
+    check( tr_memmem( needle, sizeof needle, haystack, sizeof haystack) == NULL )
+    check( tr_memmem( haystack, sizeof haystack, "", 0) == haystack )
+    check( tr_memmem( haystack, sizeof haystack, NULL, 0) == haystack )
+    check( tr_memmem( haystack, 0, "", 0) == haystack )
+
+    return 0;
+}
+
 int
 main( void )
@@ -254 +270 @@
     if( ( i = test_numbers( ) ) )
         return i;
+    if( ( i = test_memmem( ) ) )
+        return i;
 
     /* test that tr_cryptoRandInt() stays in-bounds */

trunk/libtransmission/utils.c

@@ -696 +696 @@
 #else
     size_t i;
-    for( i=0; i<haystacklen-needlelen; ++i )
+    if( !needlelen )
+        return haystack;
+    if( needlelen > haystacklen || !haystack || !needle )
+        return NULL;
+    for( i=0; i<=haystacklen-needlelen; ++i )
         if( !memcmp( haystack+i, needle, needlelen ) )
             return haystack+i;

trunk/third-party/dht/dht.c

@@ -2111 +2111 @@
     size_t i;
 
-    for(i = 0; i < haystacklen - needlelen; i++) {
+    if(needlelen > haystacklen)
+        return NULL;
+
+    for(i = 0; i <= haystacklen - needlelen; i++) {
         if(memcmp(h + i, n, needlelen) == 0)
             return (void*)(h + i);