[vlc-commits] HLS: check strtoull parsing

Jean-Baptiste Kempf git at videolan.org
Sat Nov 15 00:38:07 CET 2014


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Nov 15 00:35:06 2014 +0100| [a7984f0a1cd295f4b80a2003a30dda5ab3b315b0] | committer: Jean-Baptiste Kempf

HLS: check strtoull parsing

Else the if(end) were meaningless

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a7984f0a1cd295f4b80a2003a30dda5ab3b315b0
---

 modules/stream_filter/httplive.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index fa745af..3f5cd00 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -544,11 +544,11 @@ static int string_to_IV(char *string_hexa, uint8_t iv[AES_BLOCK_SIZE])
         if (end)
             return VLC_EGENERIC;
     } else {
-        iv_lo = strtoull(&string_hexa[len-16], NULL, 16);
+        iv_lo = strtoull(&string_hexa[len-16], &end, 16);
         if (end)
             return VLC_EGENERIC;
         string_hexa[len-16] = '\0';
-        iv_hi = strtoull(string_hexa, NULL, 16);
+        iv_hi = strtoull(string_hexa, &end, 16);
         if (end)
             return VLC_EGENERIC;
     }



More information about the vlc-commits mailing list