From a5387eb37222cff3cd2ea2835da3f76b51caeb9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 10 Feb 2014 17:25:57 +0100 Subject: [PATCH] hlsdemux: Use locale-independent int/float parsing functions from GLib --- ext/hls/m3u8.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/hls/m3u8.c b/ext/hls/m3u8.c index ac20d6d065..6beca2255f 100644 --- a/ext/hls/m3u8.c +++ b/ext/hls/m3u8.c @@ -109,20 +109,20 @@ static gboolean int_from_string (gchar * ptr, gchar ** endptr, gint * val) { gchar *end; - glong ret; + gint64 ret; g_return_val_if_fail (ptr != NULL, FALSE); g_return_val_if_fail (val != NULL, FALSE); errno = 0; - ret = strtol (ptr, &end, 10); - if ((errno == ERANGE && (ret == LONG_MAX || ret == LONG_MIN)) + ret = g_ascii_strtoll (ptr, &end, 10); + if ((errno == ERANGE && (ret == G_MAXINT64 || ret == G_MININT64)) || (errno != 0 && ret == 0)) { GST_WARNING ("%s", g_strerror (errno)); return FALSE; } - if (ret > G_MAXINT) { + if (ret > G_MAXINT || ret < G_MININT) { GST_WARNING ("%s", g_strerror (ERANGE)); return FALSE; } @@ -145,7 +145,7 @@ double_from_string (gchar * ptr, gchar ** endptr, gdouble * val) g_return_val_if_fail (val != NULL, FALSE); errno = 0; - ret = strtod (ptr, &end); + ret = g_ascii_strtod (ptr, &end); if ((errno == ERANGE && (ret == HUGE_VAL || ret == -HUGE_VAL)) || (errno != 0 && ret == 0)) { GST_WARNING ("%s", g_strerror (errno));