Changeset 51014 in vbox

Timestamp:

Apr 9, 2014 2:30:39 PM (11 years ago)

Author:

vboxsync

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

93216

Message:

Temporarily renamed iprt/x509.h to iprt/x509-branch-collision.h to avoid trouble when merging branch code later.

Location:

trunk

Files:

• include/VBox/shflsvc.h (modified) (4 diffs)
• include/iprt/x509-branch-collision.h (moved) (moved from trunk/include/iprt/x509.h )
• src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (1 diff)
• src/VBox/Runtime/common/checksum/x509.cpp (modified) (1 diff)

trunk/include/VBox/shflsvc.h

@@ -205 +205 @@
 
 /**
- * Validates a HGCM string parameter.
+ * Validates a HGCM string output parameter.
  *
  * @returns true if valid, false if not.
@@ -212 +212 @@
  * @param   cbBuf       The buffer size from the parameter.
  */
-DECLINLINE(bool) ShflStringIsValid(PCSHFLSTRING pString, uint32_t cbBuf)
+DECLINLINE(bool) ShflStringIsValidOut(PCSHFLSTRING pString, uint32_t cbBuf)
 {
     if (RT_UNLIKELY(cbBuf <= RT_UOFFSETOF(SHFLSTRING, String)))
@@ -220 +220 @@
     if (RT_UNLIKELY(pString->u16Length >= pString->u16Size))
         return false;
-    /** @todo r=bird: Check that u16Length is a multiple of two if UTF-16 input? */
-    /** @todo r=bird: Do we require the string to have a NUL terminator char, if
-     *        so check for it!! (Just had a problem with too small (/2) u16Length
-     *        and code behaving incorrectly because it worked up to the terminator
-     *        instead of the length.) */
-    /** @todo r=bird: Who checks for valid UTF-8 encoding of strings? */
     return true;
 }
 
 /**
- * Validates an optional HGCM string parameter.
+ * Validates a HGCM string input parameter.
+ *
+ * @returns true if valid, false if not.
+ *
+ * @param   pString     The string buffer pointer.
+ * @param   cbBuf       The buffer size from the parameter.
+ * @param   fUtf8Not16  Set if UTF-8 encoding, clear if UTF-16 encoding.
+ */
+DECLINLINE(bool) ShflStringIsValidIn(PCSHFLSTRING pString, uint32_t cbBuf, bool fUtf8Not16)
+{
+    int rc;
+    if (RT_UNLIKELY(cbBuf <= RT_UOFFSETOF(SHFLSTRING, String)))
+        return false;
+    if (RT_UNLIKELY((uint32_t)pString->u16Size + RT_UOFFSETOF(SHFLSTRING, String) > cbBuf))
+        return false;
+    if (fUtf8Not16)
+    {
+        /* UTF-8: */
+        if (RT_UNLIKELY(pString->u16Length >= pString->u16Size))
+            return false;
+        rc = RTStrValidateEncodingEx((const char *)&pString->String.utf8[0], pString->u16Length + 1,
+                                     RTSTR_VALIDATE_ENCODING_EXACT_LENGTH | RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED);
+    }
+    else
+    {
+        /* UTF-16: */
+        if (RT_UNLIKELY(pString->u16Length & 1))
+            return false;
+        if (RT_UNLIKELY((uint32_t)sizeof(RTUTF16) + pString->u16Length > pString->u16Size))
+            return false;
+        rc = RTUtf16ValidateEncodingEx(&pString->String.ucs2[0], pString->u16Length / 2 + 1,
+                                       RTSTR_VALIDATE_ENCODING_EXACT_LENGTH | RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED);
+    }
+    if (RT_FAILURE(rc))
+        return false;
+    return true;
+}
+
+/**
+ * Validates an optional HGCM string input parameter.
  *
  * @returns true if valid, false if not.
@@ -236 +269 @@
  * @param   pString     The string buffer pointer. Can be NULL.
  * @param   cbBuf       The buffer size from the parameter.
- */
-DECLINLINE(bool) ShflStringIsValidOrNull(PCSHFLSTRING pString, uint32_t cbBuf)
+ * @param   fUtf8Not16  Set if UTF-8 encoding, clear if UTF-16 encoding.
+ */
+DECLINLINE(bool) ShflStringIsValidOrNullIn(PCSHFLSTRING pString, uint32_t cbBuf, bool fUtf8Not16)
 {
     if (pString)
-        return ShflStringIsValid(pString, cbBuf);
+        return ShflStringIsValidIn(pString, cbBuf, fUtf8Not16);
     if (RT_UNLIKELY(cbBuf > 0))
         return false;

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -47 +47 @@
 #include <VBox/settings.h>
 
-#include <iprt/x509.h>
+#include <iprt/x509-branch-collision.h>
 #include <set>
 

trunk/src/VBox/Runtime/common/checksum/x509.cpp

@@ -30 +30 @@
 *******************************************************************************/
 #include "internal/iprt.h"
-#include <iprt/x509.h>
+#include <iprt/x509-branch-collision.h>
 
 #include <iprt/assert.h>