Changeset 36638 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 11, 2011 9:51:59 AM (14 years ago)

Author:

vboxsync

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

71104

Message:

addendum to r71078: there is another limit of 15 bytes required

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp

@@ -58 +58 @@
 DECLINLINE(char const *) RTStrEnd(char const *pszString, size_t cchMax)
 {
-    /* Avoid potential issues with memchr seen in glibc. */
-    if (cchMax > RTSTR_MEMCHR_MAX)
+    /* Avoid potential issues with memchr seen in glibc.
+     * See sysdeps/x86_64/memchr.S in glibc versions older than 2.11 */
+    while (cchMax > RTSTR_MEMCHR_MAX)
     {
         char const *pszRet = (char const *)memchr(pszString, '\0', RTSTR_MEMCHR_MAX);
@@ -72 +73 @@
 DECLINLINE(char *) RTStrEnd(char *pszString, size_t cchMax)
 {
-    /* Avoid potential issues with memchr seen in glibc. */
-    if (cchMax > RTSTR_MEMCHR_MAX)
+    /* Avoid potential issues with memchr seen in glibc.
+     * See sysdeps/x86_64/memchr.S in glibc versions older than 2.11 */
+    while (cchMax > RTSTR_MEMCHR_MAX)
     {
         char *pszRet = (char *)memchr(pszString, '\0', RTSTR_MEMCHR_MAX);