Changeset 96258 in vbox

Timestamp:

Aug 17, 2022 11:02:48 AM (2 years ago)

Author:

vboxsync

Message:

IPRT/nocrt: strstr fix. bugref:10261

Location:

trunk/src/VBox/Runtime

Files:

• common/string/strstr.cpp (modified) (1 diff)
• testcase/tstUtf8.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/string/strstr.cpp

@@ -45 +45 @@
 {
     char const  ch0Sub = *pszSubStr;
-    pszString = strchr(pszString, ch0Sub);
-    if (pszString)
+    if (ch0Sub != '\0')
     {
-        size_t const cchSubStr = strlen(pszSubStr);
-        do
+        pszString = strchr(pszString, ch0Sub);
+        if (pszString)
         {
-            if (strncmp(pszString, pszSubStr, cchSubStr) == 0)
-                return (char *)pszString;
-            if (ch0Sub)
-                pszString = strchr(pszString + 1, ch0Sub);
-            else
-                break;
-        } while (pszString != NULL);
+            size_t const cchSubStr = strlen(pszSubStr);
+            do
+            {
+                if (strncmp(pszString, pszSubStr, cchSubStr) == 0)
+                    return (char *)pszString;
+                if (ch0Sub)
+                    pszString = strchr(pszString + 1, ch0Sub);
+                else
+                    break;
+            } while (pszString != NULL);
+        }
+        return NULL;
     }
-    return NULL;
+    return (char *)pszString;
 }
 RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(strstr);

trunk/src/VBox/Runtime/testcase/tstUtf8.cpp

@@ -1121 +1121 @@
         const char *pszRet = expr; \
         if (pszRet != NULL) \
-            RTTestFailed(hTest, "%d: %#x -> %s expected NULL", __LINE__, #expr, pszRet); \
+            RTTestFailed(hTest, "%d: %s -> %s expected NULL", __LINE__, #expr, pszRet); \
     } while (0)
 
 #define CHECK(expr, expect) \
     do { \
-        const char *pszRet = expr; \
-        const char *pszExpect = (expect); \
+        const char * const pszRet = expr; \
+        const char * const pszExpect = (expect); \
         if (   (pszRet != NULL && pszExpect == NULL) \
             || (pszRet == NULL && pszExpect != NULL) \
             || strcmp(pszRet, pszExpect) \
             ) \
-            RTTestFailed(hTest, "%d: %#x -> %s expected %s", __LINE__, #expr, pszRet, pszExpect); \
+            RTTestFailed(hTest, "%d: %s -> %s expected %s", __LINE__, #expr, pszRet, pszExpect); \
     } while (0)