vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Sat Nov 15 00:35:06 2014 +0100| [2c878ef805672fab82e88bf5ab909663c046368f] | committer: Jean-Baptiste Kempf
HLS: check strtoull parsing (cherry picked from commit a7984f0a1cd295f4b80a2003a30dda5ab3b315b0) (cherry picked from commit cd84eec0f5d64bc4ea6289029cc737e0f8358296) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=2c878ef805672fab82e88bf5ab909663c046368f --- modules/stream_filter/httplive.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c index fa745af..2a59527 100644 --- a/modules/stream_filter/httplive.c +++ b/modules/stream_filter/httplive.c @@ -541,15 +541,15 @@ static int string_to_IV(char *string_hexa, uint8_t iv[AES_BLOCK_SIZE]) if (len <= 16) { iv_hi = 0; iv_lo = strtoull(string_hexa, &end, 16); - if (end) + if (*end) return VLC_EGENERIC; } else { - iv_lo = strtoull(&string_hexa[len-16], NULL, 16); - if (end) + 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); - if (end) + iv_hi = strtoull(string_hexa, &end, 16); + if (*end) return VLC_EGENERIC; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
