儲存庫 vbox 的更動 67645

時間撮記:

2017-6-27 下午04:36:58 (7 年 以前)

作者:

vboxsync

訊息:

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.

位置:

trunk

檔案:

• include/iprt/cpp/ministring.h (修改) (1 筆差異)
• src/VBox/Runtime/common/string/ministring.cpp (修改) (1 筆差異)

trunk/include/iprt/cpp/ministring.h

@@ -694 +694 @@
      * Find the given substring.
      *
-     * Looks for pcszFind in "this" starting at "pos" and returns its position
-     * as a byte (not codepoint) offset, counting from the beginning of "this" at 0.
-     *
-     * @param   pcszFind        The substring to find.
-     * @param   pos             The (byte) offset into the string buffer to start
+     * Looks for @a pszNeedle in @a this starting at @a offStart and returns its
+     * position as a byte (not codepoint) offset, counting from the beginning of
+     * @a this as 0.
+     *
+     * @param   pszNeedle       The substring to find.
+     * @param   offStart        The (byte) offset into the string buffer to start
      *                          searching.
      *
-     * @returns 0 based position of pcszFind. npos if not found.
-     */
-    size_t find(const char *pcszFind, size_t pos = 0) const;
+     * @returns 0 based position of pszNeedle. npos if not found.
+     */
+    size_t find(const char *pszNeedle, size_t offStart = 0) const;
+
+    /**
+     * Find the given substring.
+     *
+     * Looks for @a pStrNeedle in @a this starting at @a offStart and returns its
+     * position as a byte (not codepoint) offset, counting from the beginning of
+     * @a this as 0.
+     *
+     * @param   pStrNeedle      The substring to find.
+     * @param   offStart        The (byte) offset into the string buffer to start
+     *                          searching.
+     *
+     * @returns 0 based position of pStrNeedle. npos if not found or pStrNeedle is
+     *          NULL or an empty string.
+     */
+    size_t find(const RTCString *pStrNeedle, size_t offStart = 0) const;
 
     /**

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;
+                }
+            }
         }
     }