Attachment 63789 Details for Bug 51443 – fix

[patch] fix

patch.diff (text/plain), 1.53 KB, created by Adrian Johnson on 2012-07-03 15:57:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Johnson

Created: 2012-07-03 15:57:56 UTC

Size: 1.53 KB

patch

obsolete

>diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
>index 6f0cd66..aeaf5b1 100644
>--- a/src/cairo-cff-subset.c
>+++ b/src/cairo-cff-subset.c
>@@ -51,6 +51,7 @@
> #include "cairo-scaled-font-subsets-private.h"
> #include "cairo-truetype-subset-private.h"
> #include <string.h>
>+#include <locale.h>
> 
> /* CFF Dict Operators. If the high byte is 0 the command is encoded
>  * with a single byte. */
>@@ -293,11 +294,23 @@ decode_nibble (int n, char *buf)
> static unsigned char *
> decode_real (unsigned char *p, double *real)
> {
>+    struct lconv *locale_data;
>+    const char *decimal_point;
>+    int decimal_point_len;
>     int n;
>     char buffer[100];
>+    char buffer2[200];
>+    char *q;
>     char *buf = buffer;
>     char *buf_end = buffer + sizeof (buf);
> 
>+    locale_data = localeconv ();
>+    decimal_point = locale_data->decimal_point;
>+    decimal_point_len = strlen (decimal_point);
>+
>+    assert (decimal_point_len != 0);
>+    assert (sizeof(buffer) + decimal_point_len < sizeof(buffer2));
>+
>     p++;
>     while (buf + 2 < buf_end) {
> 	n = *p >> 4;
>@@ -312,7 +325,18 @@ decode_real (unsigned char *p, double *real)
>     };
>     *buf = 0;
> 
>-    if (sscanf(buffer, "%lf", real) != 1)
>+    buf = buffer;
>+    if (strchr (buffer, '.')) {
>+	 q = strchr (buffer, '.');
>+	 strncpy (buffer2, buffer, q - buffer);
>+	 buf = buffer2 + (q - buffer);
>+	 strncpy (buf, decimal_point, decimal_point_len);
>+	 buf += decimal_point_len;
>+	 strcpy (buf, q + 1);
>+	 buf = buffer2;
>+    }
>+
>+    if (sscanf(buf, "%lf", real) != 1)
>         *real = 0.0;
> 
>     return p;

Actions: View | Splinter Review

Attachments on bug 51443: 63485 | 63486 | 63699 | 63710 | 63756 | 63780 | 63781 | 63782 | 63787 | 63788 | 63789 | 63790 | 63791 | 63792

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.