Changeset 90821 in vbox for trunk/src

Timestamp:

Aug 23, 2021 10:04:06 PM (3 years ago)

Author:

vboxsync

Message:

IPRT: More VALID_PTR -> RT_VALID_PTR with some bad-printf-pointer details thrown in.

Location:

trunk/src/VBox/Runtime

Files:

• common/string/strformat.cpp (modified) (1 diff)
• common/string/strformatrt.cpp (modified) (12 diffs)
• include/internal/string.h (modified) (1 diff)

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

@@ -49 +49 @@
  * Deals with bad pointers.
  */
-static size_t rtStrFormatBadPointer(size_t cch, PFNRTSTROUTPUT pfnOutput, void *pvArgOutput, int cchWidth,
-                                    unsigned fFlags, void const *pvStr, char szTmp[64], const char *pszTag, int cchTag)
+DECLHIDDEN(size_t) rtStrFormatBadPointer(size_t cch, PFNRTSTROUTPUT pfnOutput, void *pvArgOutput, int cchWidth,
+                                         unsigned fFlags, void const *pvStr, char szTmp[64], const char *pszTag, int cchTag)
 {
     static char const s_szNull[] = "<NULL>";

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

@@ -356 +356 @@
 #undef STRMEM
                 };
-                static const char s_szNull[] = "<NULL>";
 
                 const char *pszType = *ppszFormat - 1;
@@ -572 +571 @@
 
                     case RTSF_IPV6:
-                    {
-                        if (VALID_PTR(u.pIpv6Addr))
+                        if (RT_VALID_PTR(u.pIpv6Addr))
                             return rtstrFormatIPv6(pfnOutput, pvArgOutput, u.pIpv6Addr);
-                        return pfnOutput(pvArgOutput, s_szNull, sizeof(s_szNull) - 1);
-                    }
+                        return rtStrFormatBadPointer(0, pfnOutput, pvArgOutput, cchWidth, fFlags, u.pIpv6Addr,
+                                                     szBuf, RT_STR_TUPLE("!BadIPv6"));
 
                     case RTSF_MAC:
-                    {
-                        if (VALID_PTR(u.pMac))
+                        if (RT_VALID_PTR(u.pMac))
                             return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
                                                "%02x:%02x:%02x:%02x:%02x:%02x",
@@ -589 +586 @@
                                                u.pMac->au8[4],
                                                u.pMac->au8[5]);
-                        return pfnOutput(pvArgOutput, s_szNull, sizeof(s_szNull) - 1);
-                    }
+                        return rtStrFormatBadPointer(0, pfnOutput, pvArgOutput, cchWidth, fFlags, u.pMac,
+                                                     szBuf, RT_STR_TUPLE("!BadMac"));
 
                     case RTSF_NETADDR:
-                    {
-                        if (VALID_PTR(u.pNetAddr))
+                        if (RT_VALID_PTR(u.pNetAddr))
                         {
                             switch (u.pNetAddr->enmType)
@@ -639 +635 @@
                             }
                         }
-                        return pfnOutput(pvArgOutput, s_szNull, sizeof(s_szNull) - 1);
-                    }
+                        return rtStrFormatBadPointer(0, pfnOutput, pvArgOutput, cchWidth, fFlags, u.pNetAddr,
+                                                     szBuf, RT_STR_TUPLE("!BadNetAddr"));
 
                     case RTSF_UUID:
-                    {
-                        if (VALID_PTR(u.pUuid))
-                        {
+                        if (RT_VALID_PTR(u.pUuid))
                             /* cannot call RTUuidToStr because of GC/R0. */
                             return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
@@ -660 +654 @@
                                                u.pUuid->Gen.au8Node[4],
                                                u.pUuid->Gen.au8Node[5]);
-                        }
-                        return pfnOutput(pvArgOutput, s_szNull, sizeof(s_szNull) - 1);
-                    }
+                        return rtStrFormatBadPointer(0, pfnOutput, pvArgOutput, cchWidth, fFlags, u.pUuid,
+                                                     szBuf, RT_STR_TUPLE("!BadUuid"));
 
                     case RTSF_ERRINFO:
                     case RTSF_ERRINFO_MSG_ONLY:
-                    {
-                        if (VALID_PTR(u.pErrInfo) && RTErrInfoIsSet(u.pErrInfo))
+                        if (RT_VALID_PTR(u.pErrInfo) && RTErrInfoIsSet(u.pErrInfo))
                         {
                             cch = 0;
@@ -690 +682 @@
                         }
                         return 0;
-                    }
 
                     default:
@@ -717 +708 @@
                         const char *pszLastSep;
                         const char *psz = pszLastSep = va_arg(*pArgs, const char *);
-                        if (!VALID_PTR(psz))
-                            return pfnOutput(pvArgOutput, RT_STR_TUPLE("<null>"));
+                        if (!RT_VALID_PTR(psz))
+                            return rtStrFormatBadPointer(0, pfnOutput, pvArgOutput, cchWidth, fFlags, psz,
+                                                         szBuf, RT_STR_TUPLE("!BadBaseName"));
 
                         while ((ch = *psz) != '\0')
@@ -813 +805 @@
                         int cAngle = 0;
 
-                        if (!VALID_PTR(psz))
-                            return pfnOutput(pvArgOutput, RT_STR_TUPLE("<null>"));
+                        if (!RT_VALID_PTR(psz))
+                            return rtStrFormatBadPointer(0, pfnOutput, pvArgOutput, cchWidth, fFlags, psz,
+                                                         szBuf, RT_STR_TUPLE("!BadFnNm"));
 
                         while ((ch = *psz) != '\0' && ch != '(')
@@ -1343 +1336 @@
                  * If it's a pointer, we'll check if it's valid before going on.
                  */
-                if ((s_aTypes[i].fFlags & RTST_FLAGS_POINTER) && !VALID_PTR(u.pv))
-                    return pfnOutput(pvArgOutput, RT_STR_TUPLE("<null>"));
+                if ((s_aTypes[i].fFlags & RTST_FLAGS_POINTER) && !RT_VALID_PTR(u.pv))
+                    return rtStrFormatBadPointer(0, pfnOutput, pvArgOutput, cchWidth, fFlags, u.pv,
+                                                 szBuf, RT_STR_TUPLE("!BadRD"));
 
                 /*
@@ -1389 +1383 @@
                             ssize_t     offLast;
 
-                            if (!VALID_PTR(pszStr))
+                            if (!RT_VALID_PTR(pszStr))
                                 pszStr = "<NULL>";
                             cchStr = RTStrNLen(pszStr, (unsigned)cchPrecision);
@@ -1451 +1445 @@
                             ssize_t     offLast;
 
-                            if (!VALID_PTR(pszStr))
+                            if (!RT_VALID_PTR(pszStr))
                                 pszStr = "<NULL>";
                             cchStr = RTStrNLen(pszStr, (unsigned)cchPrecision);
@@ -1533 +1527 @@
                                    ("Invalid IPRT format type '%.10s'!\n", pszFormatOrg));
 
-                    if (!VALID_PTR(pszStr))
+                    if (!RT_VALID_PTR(pszStr))
                         pszStr = "<NULL>";
                     cchStr = RTStrNLen(pszStr, (unsigned)cchPrecision);

trunk/src/VBox/Runtime/include/internal/string.h

@@ -51 +51 @@
 #endif
 
+DECLHIDDEN(size_t) rtStrFormatBadPointer(size_t cch, PFNRTSTROUTPUT pfnOutput, void *pvArgOutput, int cchWidth,
+                                         unsigned fFlags, void const *pvStr, char szTmp[64], const char *pszTag, int cchTag);
 DECLHIDDEN(size_t) rtstrFormatRt(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput, const char **ppszFormat, va_list *pArgs,
                                  int cchWidth, int cchPrecision, unsigned fFlags, char chArgSize);