shithub: openh264

Info  •  Files  •  Log  •  Branches

Make sure the buffer always is null terminated in the *snprintf calls for old MSVC

These functions leave the buffer unterminated in case it was too
small.

--- a/codec/common/crt_util_safe_x.cpp

+++ b/codec/common/crt_util_safe_x.cpp

@@ -125,6 +125,8 @@

   va_start (pArgPtr, kpFormat);

   iRc = vsnprintf (pBuffer, iSizeOfBuffer, kpFormat, pArgPtr); //confirmed_safe_unsafe_usage

+  if (iRc < 0)

+    pBuffer[iSizeOfBuffer - 1] = '\0';

   va_end (pArgPtr);

@@ -142,7 +144,10 @@

 }

 int32_t WelsVsnprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, va_list pArgPtr) {

-  return vsnprintf (pBuffer, iSizeOfBuffer, kpFormat, pArgPtr); //confirmed_safe_unsafe_usage

+  int32_t iRc = vsnprintf (pBuffer, iSizeOfBuffer, kpFormat, pArgPtr); //confirmed_safe_unsafe_usage

+  if (iRc < 0)

+    pBuffer[iSizeOfBuffer - 1] = '\0';

+  return iRc;

 }