Changeset 67645 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Jun 27, 2017 4:36:58 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

116419

Message:

IPRT: RTCString::find: Made it return npos if the string to search for is empty or NULL (strstr will return the first string if empty and crash if NULL). Nobody seems to try search for empty strings. Added a find method taking a string object.

File:

• trunk/src/VBox/Runtime/common/string/ministring.cpp (modified) (1 diff)

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

@@ -200 +200 @@
 }
 
-size_t RTCString::find(const char *pcszFind, size_t pos /*= 0*/) const
-{
-    if (pos < length())
+size_t RTCString::find(const char *pszNeedle, size_t offStart /*= 0*/) const
+{
+    if (offStart < length())
     {
         const char *pszThis = c_str();
         if (pszThis)
         {
-            const char *pszHit = strstr(pszThis + pos, pcszFind);
-            if (pszHit)
-                return pszHit - pszThis;
+            if (pszNeedle && *pszNeedle != '\0')
+            {
+                const char *pszHit = strstr(pszThis + offStart, pszNeedle);
+                if (pszHit)
+                    return pszHit - pszThis;
+            }
+        }
+    }
+
+    return npos;
+}
+
+size_t RTCString::find(const RTCString *pStrNeedle, size_t offStart /*= 0*/) const
+{
+    if (offStart < length())
+    {
+        const char *pszThis = c_str();
+        if (pszThis)
+        {
+            if (pStrNeedle)
+            {
+                const char *pszNeedle = pStrNeedle->c_str();
+                if (pszNeedle && *pszNeedle != '\0')
+                {
+                    const char *pszHit = strstr(pszThis + offStart, pszNeedle);
+                    if (pszHit)
+                        return pszHit - pszThis;
+                }
+            }
         }
     }