Changeset 103444 in vbox

Timestamp:

Feb 19, 2024 1:58:17 PM (11 months ago)

Author:

vboxsync

Message:

IPRT: Reverted r161541, r161577 & r161578 because the RTStrCopy2 and RTStrCat2 functions encourages writing unsafe code, given that RTStrCat[2] doesn't check for NULL destination buffers and will crash if the two are chained.

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (2 diffs)
• include/iprt/string.h (modified) (2 diffs)
• src/VBox/Runtime/common/string/RTStrCat.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/string/RTStrCopy.cpp (modified) (2 diffs)

trunk/include/iprt/mangling.h

@@ -2266 +2266 @@
 # define RTStrCalcUtf16LenEx                            RT_MANGLER(RTStrCalcUtf16LenEx)
 # define RTStrCat                                       RT_MANGLER(RTStrCat)
-# define RTStrCat2                                      RT_MANGLER(RTStrCat2)
 # define RTStrCatEx                                     RT_MANGLER(RTStrCatEx)
 # define RTStrCatP                                      RT_MANGLER(RTStrCatP)
@@ -2274 +2273 @@
 # define RTStrConvertHexBytesEx                         RT_MANGLER(RTStrConvertHexBytesEx)
 # define RTStrCopy                                      RT_MANGLER(RTStrCopy)
-# define RTStrCopy2                                     RT_MANGLER(RTStrCopy2)
 # define RTStrCopyEx                                    RT_MANGLER(RTStrCopyEx)
 # define RTStrCopyP                                     RT_MANGLER(RTStrCopyP)

trunk/include/iprt/string.h

@@ -2378 +2378 @@
  * String copy with overflow handling.
  *
- * @return  Pointer to \a pszDst on success, or NULL on failure.
- *
- * @param   pszDst              The destination buffer.
- * @param   cbDst               The size of the destination buffer (in bytes).
- * @param   pszSrc              The source string.  NULL is not OK.
- */
-RTDECL(char *) RTStrCopy2(char *pszDst, size_t cbDst, const char *pszSrc);
-
-/**
- * String copy with overflow handling.
- *
  * @retval  VINF_SUCCESS on success.
  * @retval  VERR_BUFFER_OVERFLOW if the destination buffer is too small.  The
@@ -2457 +2446 @@
  */
 RTDECL(int) RTStrCat(char *pszDst, size_t cbDst, const char *pszSrc);
-
-/**
- * String concatenation with overflow handling.
- *
- * @return  Pointer to \a pszDst on success, or NULL on failure.
- *
- * @param   pszDst              The destination buffer.
- * @param   cbDst               The size of the destination buffer (in bytes).
- * @param   pszSrc              The source string.  NULL is not OK.
- */
-RTDECL(char *) RTStrCat2(char *pszDst, size_t cbDst, const char *pszSrc);
 
 /**

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

@@ -45 +45 @@
 
 
-DECLINLINE(int) rtStrCat(char *pszDst, size_t cbDst, const char *pszSrc)
+RTDECL(int) RTStrCat(char *pszDst, size_t cbDst, const char *pszSrc)
 {
     char *pszDst2 = RTStrEnd(pszDst, cbDst);
@@ -65 +65 @@
     return VERR_BUFFER_OVERFLOW;
 }
-
-RTDECL(int) RTStrCat(char *pszDst, size_t cbDst, const char *pszSrc)
-{
-    return rtStrCat(pszDst, cbDst, pszSrc);
-}
 RT_EXPORT_SYMBOL(RTStrCat);
 
-RTDECL(char *) RTStrCat2(char *pszDst, size_t cbDst, const char *pszSrc)
-{
-    return RT_SUCCESS(rtStrCat(pszDst, cbDst, pszSrc)) ? pszDst : NULL;
-}
-RT_EXPORT_SYMBOL(RTStrCat2);
-

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

@@ -45 +45 @@
 
 
-DECLINLINE(int) rtStrCopy(char *pszDst, size_t cbDst, const char *pszSrc)
+RTDECL(int) RTStrCopy(char *pszDst, size_t cbDst, const char *pszSrc)
 {
     size_t cchSrc = strlen(pszSrc);
@@ -61 +61 @@
     return VERR_BUFFER_OVERFLOW;
 }
-
-RTDECL(int) RTStrCopy(char *pszDst, size_t cbDst, const char *pszSrc)
-{
-    return rtStrCopy(pszDst, cbDst, pszSrc);
-}
 RT_EXPORT_SYMBOL(RTStrCopy);
 
-RTDECL(char *) RTStrCopy2(char *pszDst, size_t cbDst, const char *pszSrc)
-{
-    return RT_SUCCESS(rtStrCopy(pszDst, cbDst, pszSrc)) ? pszDst : NULL;
-}
-RT_EXPORT_SYMBOL(RTStrCopy2);
-