Changeset f2d2c7ba in mainline

Timestamp:

2009-04-21T16:36:52Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

253d3d0

Parents:

c2417bc

Message:

fix of-by-one-character bug in str_chr() and str_rchr()

Files:

• kernel/generic/src/lib/string.c (modified) (1 diff)
• uspace/lib/libc/generic/string.c (modified) (2 diffs)

kernel/generic/src/lib/string.c

@@ -642 +642 @@
         wchar_t acc;
         size_t off = 0;
+        size_t last = 0;
         
         while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
                 if (acc == ch)
-                        return (str + off);
+                        return (str + last);
+                last = off;
         }
         

uspace/lib/libc/generic/string.c

@@ -594 +594 @@
         wchar_t acc;
         size_t off = 0;
+        size_t last = 0;
         
         while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
                 if (acc == ch)
-                        return (str + off);
+                        return (str + last);
+                last = off;
         }
         
@@ -614 +616 @@
         wchar_t acc;
         size_t off = 0;
-        char *res;
-
-        res = NULL;
+        size_t last = 0;
+        char *res = NULL;
+        
         while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
                 if (acc == ch)
-                        res = (str + off);
-        }
-
+                        res = (str + last);
+                last = off;
+        }
+        
         return res;
 }