AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid dec = -dec overflow when appending most negative signed integers.

Browse Source 
BUG=skia:3096

Review URL: https://codereview.chromium.org/700953003
This commit is contained in:
mtklein 2014-11-05 11:35:21 -08:00 committed by Commit bot
parent 76c4fa6e30
commit 225fb98e1e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/SkString.cpp
View File

@ -90,11 +90,12 @@ char* SkStrAppendU32(char string[], uint32_t dec) {
} }
char* SkStrAppendS32(char string[], int32_t dec) { char* SkStrAppendS32(char string[], int32_t dec) {
uint32_t udec = dec;
if (dec < 0) { if (dec < 0) {
*string++ = '-'; *string++ = '-';
dec = -dec; udec = ~udec + 1; // udec = -udec, but silences some warnings that are trying to be helpful
} }
return SkStrAppendU32(string, static_cast<uint32_t>(dec)); return SkStrAppendU32(string, udec);
} }
char* SkStrAppendU64(char string[], uint64_t dec, int minDigits) { char* SkStrAppendU64(char string[], uint64_t dec, int minDigits) {
@ -124,11 +125,12 @@ char* SkStrAppendU64(char string[], uint64_t dec, int minDigits) {
} }
char* SkStrAppendS64(char string[], int64_t dec, int minDigits) { char* SkStrAppendS64(char string[], int64_t dec, int minDigits) {
uint64_t udec = dec;
if (dec < 0) { if (dec < 0) {
*string++ = '-'; *string++ = '-';
dec = -dec; udec = ~udec + 1; // udec = -udec, but silences some warnings that are trying to be helpful
} }
return SkStrAppendU64(string, static_cast<uint64_t>(dec), minDigits); return SkStrAppendU64(string, udec, minDigits);
} }
char* SkStrAppendFloat(char string[], float value) { char* SkStrAppendFloat(char string[], float value) {