UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-21 06:40:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Decimal: fix buffer overflow in convertToText

Browse Source
This commit is contained in:
Émilie Feral
2018-05-22 14:24:02 +02:00
committed by LeaNumworks
parent 84a78c8a9b
commit 386ebc5bfc
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
poincare/src/decimal.cpp
View File

@@ -128,8 +128,8 @@ int Decimal::convertToText(char * buffer, int bufferSize, PrintFloat::Mode mode,
}
int mantissaLength = absMantissa.writeTextInBuffer(tempBuffer, PrintFloat::k_numberOfStoredSignificantDigits+1);
if (strcmp(tempBuffer, "undef") == 0) {
strlcpy(buffer, tempBuffer, bufferSize);
return mantissaLength;
currentChar = strlcpy(buffer, tempBuffer, bufferSize);
return currentChar;
}
/* We force scientific mode if the number of digits before the dot is superior
* to the number of significant digits (ie with 4 significant digits,
@@ -140,6 +140,7 @@ int Decimal::convertToText(char * buffer, int bufferSize, PrintFloat::Mode mode,
numberOfRequiredDigits = mantissaLength > exponent ? mantissaLength : exponent;
numberOfRequiredDigits = exponent < 0 ? 1+mantissaLength-exponent : numberOfRequiredDigits;
}
if (currentChar >= bufferSize-1) { return bufferSize-1; }
if (m_mantissa.isNegative()) {
buffer[currentChar++] = '-';
if (currentChar >= bufferSize-1) { return bufferSize-1; }
@@ -188,6 +189,7 @@ int Decimal::convertToText(char * buffer, int bufferSize, PrintFloat::Mode mode,
for (int i = currentChar-1; i > decimalMarkerPosition; i--) {
buffer[i+1] = buffer[i];
}
if (currentChar >= bufferSize-1) { return bufferSize-1; }
buffer[decimalMarkerPosition+1] = '.';
currentChar++;
}
@@ -198,6 +200,7 @@ int Decimal::convertToText(char * buffer, int bufferSize, PrintFloat::Mode mode,
buffer[currentChar++] = '0';
}
}
if (currentChar >= bufferSize-1) { return bufferSize-1; }
buffer[currentChar] = 0;
return currentChar;
}