Attachment 137957 Details for Bug 105415 – another try

[patch] another try

foo.diff (text/plain), 1.17 KB, created by Akira TAGOH on 2018-03-10 08:17:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Akira TAGOH

Created: 2018-03-10 08:17:15 UTC

Size: 1.17 KB

patch

obsolete

>diff --git a/src/fcname.c b/src/fcname.c
>index 79e413e..f467edb 100644
>--- a/src/fcname.c
>+++ b/src/fcname.c
>@@ -330,13 +330,39 @@ FcNameConvert (FcType type, FcChar8 *string)
>     case FcTypeRange:
> 	if (sscanf ((char *) string, "[%lg %lg]", &b, &e) != 2)
> 	{
>-	    v.u.d = strtod ((char *) string, &p);
>-	    if (p != NULL && p[0] != 0)
>+	    char *sc, *ec;
>+	    size_t len = strlen ((const char *) string);
>+	    int si, ei;
>+
>+	    sc = malloc (len);
>+	    ec = malloc (len);
>+	    if (sc && ec && sscanf ((char *) string, "[%s %[^]]]", sc, ec) == 2)
> 	    {
>-		v.type = FcTypeVoid;
>-		break;
>+		if (FcNameConstant ((const FcChar8 *) sc, &si) && FcNameConstant ((const FcChar8 *) ec, &ei))
>+		    v.u.r =  FcRangeCreateDouble (si, ei);
>+		else
>+		    goto bail1;
>+	    }
>+	    else
>+	    {
>+	    bail1:
>+		if (FcNameConstant (string, &si))
>+		{
>+		    v.u.d = (double) si;
>+		} else {
>+		    v.u.d = strtod ((char *) string, &p);
>+		    if (p != NULL && p[0] != 0)
>+		    {
>+			v.type = FcTypeVoid;
>+			break;
>+		    }
>+		}
>+		v.type = FcTypeDouble;
> 	    }
>-	    v.type = FcTypeDouble;
>+	    if (sc)
>+		free (sc);
>+	    if (ec)
>+		free (ec);
> 	}
> 	else
> 	    v.u.r = FcRangeCreateDouble (b, e);

Actions: View | Splinter Review

Attachments on bug 105415: 137956 | 137957 | 137958

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.