Fix Savannah bug #43153.

* src/psaux/psconv.c (PS_Conv_ToFixed): Add protection against overflow in `divider'.
11 years ago · bc12d9e9ac
parent 336735d8de
commit bc12d9e9ac
2 changed files with 9 additions and 1 deletions
--- a/7
+++ b/7
@ -1,3 +1,10 @@
+2014-09-08  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	Fix Savannah bug #43153.
+
+	* src/psaux/psconv.c (PS_Conv_ToFixed): Add protection against
+	overflow in `divider'. 
+
 2014-09-03  Alexei Podtelezhnikov  <apodtele@gmail.com>

 	[base] Tighten the overflow check in `FT_DivFix'.
--- a/src/psaux/psconv.c
+++ b/src/psaux/psconv.c
@ -250,7 +250,8 @@
        if ( c < 0 || c >= 10 )
          break;

-        if ( decimal < 0xCCCCCCCL )
+        /* only add digit if we don't overflow */
+        if ( divider < 0xCCCCCCCL && decimal < 0xCCCCCCCL )
        {
          decimal = decimal * 10 + c;