Fix handling of snprintf return values and buffer size calculations
Showing the changes to codec/decoder (1 of 3 files). Show all
Unified · Split
| @@ -90,10 +90,12 @@ CWelsDecoder::CWelsDecoder (void_t) · 89 unmodified lines | ||
| 90 | 90 | str_t chFileName[1024] = { 0 }; //for .264 |
| 91 | 91 | int iBufUsed = 0; |
| 92 | 92 | int iBufLeft = 1023; |
| 93 | + int iCurUsed; | |
| 93 | 94 | |
| 94 | 95 | str_t chFileNameSize[1024] = { 0 }; //for .len |
| 95 | 96 | int iBufUsedSize = 0; |
| 96 | 97 | int iBufLeftSize = 1023; |
| 98 | + int iCurUsedSize; | |
| 97 | 99 | #endif//OUTPUT_BIT_STREAM |
| 98 | 100 | |
| 99 | 101 | m_pTrace = CreateWelsTrace (Wels_Trace_Type); |
| @@ -106,30 +108,44 @@ CWelsDecoder::CWelsDecoder (void_t) · 6 unmodified lines | ||
| 106 | 108 | |
| 107 | 109 | WelsGetTimeOfDay (&sCurTime); |
| 108 | 110 | |
| 109 | − iBufUsed += WelsSnprintf (chFileName, iBufLeft, "bs_0x%p_", (void_t*)this); | |
| 110 | − iBufUsedSize += WelsSnprintf (chFileNameSize, iBufLeftSize, "size_0x%p_", (void_t*)this); | |
| 111 | + iCurUsed = WelsSnprintf (chFileName, iBufLeft, "bs_0x%p_", (void_t*)this); | |
| 112 | + iCurUsedSize = WelsSnprintf (chFileNameSize, iBufLeftSize, "size_0x%p_", (void_t*)this); | |
| 111 | 113 | |
| 112 | − iBufLeft -= iBufUsed; | |
| 113 | − if (iBufLeft > iBufUsed) { | |
| 114 | − iBufUsed += WelsStrftime (&chFileName[iBufUsed], iBufLeft, "%y%m%d%H%M%S", &sCurTime); | |
| 115 | − iBufLeft -= iBufUsed; | |
| 114 | + if (iCurUsed > 0) { | |
| 115 | + iBufUsed += iCurUsed; | |
| 116 | + iBufLeft -= iCurUsed; | |
| 117 | + } | |
| 118 | + if (iBufLeft > 0) { | |
| 119 | + iCurUsed = WelsStrftime (&chFileName[iBufUsed], iBufLeft, "%y%m%d%H%M%S", &sCurTime); | |
| 120 | + iBufUsed += iCurUsed; | |
| 121 | + iBufLeft -= iCurUsed; | |
| 116 | 122 | } |
| 117 | 123 | |
| 118 | − iBufLeftSize -= iBufUsedSize; | |
| 119 | − if (iBufLeftSize > iBufUsedSize) { | |
| 120 | − iBufUsedSize += WelsStrftime (&chFileNameSize[iBufUsedSize], iBufLeftSize, "%y%m%d%H%M%S", &sCurTime); | |
| 121 | − iBufLeftSize -= iBufUsedSize; | |
| 124 | + if (iCurUsedSize > 0) { | |
| 125 | + iBufUsedSize += iCurUsedSize; | |
| 126 | + iBufLeftSize -= iCurUsedSize; | |
| 127 | + } | |
| 128 | + if (iBufLeftSize > 0) { | |
| 129 | + iCurUsedSize = WelsStrftime (&chFileNameSize[iBufUsedSize], iBufLeftSize, "%y%m%d%H%M%S", &sCurTime); | |
| 130 | + iBufUsedSize += iCurUsedSize; | |
| 131 | + iBufLeftSize -= iCurUsedSize; | |
| 122 | 132 | } |
| 123 | 133 | |
| 124 | − if (iBufLeft > iBufUsed) { | |
| 125 | − iBufUsed += WelsSnprintf (&chFileName[iBufUsed], iBufLeft, ".%03.3u.264", WelsGetMillsecond (&sCurTime)); | |
| 126 | − iBufLeft -= iBufUsed; | |
| 134 | + if (iBufLeft > 0) { | |
| 135 | + iCurUsed = WelsSnprintf (&chFileName[iBufUsed], iBufLeft, ".%03.3u.264", WelsGetMillsecond (&sCurTime)); | |
| 136 | + if (iCurUsed > 0) { | |
| 137 | + iBufUsed += iCurUsed; | |
| 138 | + iBufLeft -= iCurUsed; | |
| 139 | + } | |
| 127 | 140 | } |
| 128 | 141 | |
| 129 | − if (iBufLeftSize > iBufUsedSize) { | |
| 130 | − iBufUsedSize += WelsSnprintf (&chFileNameSize[iBufUsedSize], iBufLeftSize, ".%03.3u.len", | |
| 131 | − WelsGetMillsecond (&sCurTime)); | |
| 132 | − iBufLeftSize -= iBufUsedSize; | |
| 142 | + if (iBufLeftSize > 0) { | |
| 143 | + iCurUsedSize = WelsSnprintf (&chFileNameSize[iBufUsedSize], iBufLeftSize, ".%03.3u.len", | |
| 144 | + WelsGetMillsecond (&sCurTime)); | |
| 145 | + if (iCurUsedSize > 0) { | |
| 146 | + iBufUsedSize += iCurUsedSize; | |
| 147 | + iBufLeftSize -= iCurUsedSize; | |
| 148 | + } | |
| 133 | 149 | } |
| 134 | 150 | |
| 135 | 151 | |