Changeset 103444 in vbox for trunk/include

Timestamp:

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

Author:

vboxsync

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

161775

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/include/iprt

Files:

• mangling.h (modified) (2 diffs)
• string.h (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);
 
 /**