shithub: openh264

Info  •  Files  •  Log  •  Branches

Use WelsSnprintf instead of a combination of strlen and STRNCAT

This simplifies the code and makes the buffer size checks
more consistent. Additionally, the previous version wrote
the extra space character without checking if it actually fit
into the buffer.

--- a/codec/encoder/core/src/utils.cpp

+++ b/codec/encoder/core/src/utils.cpp

@@ -208,13 +208,11 @@

       str_t* pStr = NULL;

       pStr	= GetLogTag (kiLevel, &i_shift);

       if (NULL != pStr) {

-        int32_t iLenTag = strlen (pStr);	// confirmed_safe_unsafe_usage

-        STRCAT (&pBuf[iBufUsed], iBufLeft, pStr);	// confirmed_safe_unsafe_usage

-        iBufUsed += iLenTag;

-        pBuf[iBufUsed] = ' ';

-        iBufUsed++;

-        ++iLenTag;

-        iBufLeft -= iLenTag;

+        iCurUsed = WelsSnprintf (&pBuf[iBufUsed], iBufLeft, "%s ", pStr);

+        if (iCurUsed >= 0) {

+          iBufUsed += iCurUsed;

+          iBufLeft -= iCurUsed;

+        }

       }

     }

     if (iBufLeft > 0) {