Changeset 3147 in MondoRescue for branches/3.1/mondo/src/lib/mr_str.c

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/lib/mr_str.c (modified) (1 diff)

branches/3.1/mondo/src/lib/mr_str.c

@@ -28 +28 @@
     size_t pos1 = 0;
     size_t pos2 = 0;
+
+    if (instr == NULL) {
+        *lastpos = 0;
+        return token;
+    }
+
+    if (delims == NULL) {
+        *lastpos = 0;
+        return token;
+    }
 
     if (strlen(instr) <= *lastpos) {