From 104d04182d85e8538e8934c072432a05ab7ed999 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Wed, 18 Jul 2007 07:57:26 +0000 Subject: fix emulated inet_aton so that it fails for invalid addresses patch by elupus: \elupus ecce se/ original thread: [FFmpeg-devel] [PATCH] emulated inet_aton doesn't fail for invalidaddresses date: 07/15/2007 12:40 AM Originally committed as revision 9731 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/os_support.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libavformat/os_support.c') diff --git a/libavformat/os_support.c b/libavformat/os_support.c index e28a7bc748..5342a02ed0 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -46,16 +46,17 @@ int inet_aton (const char * str, struct in_addr * add) add1 = atoi(pch); pch = strpbrk(pch,"."); - if (pch == 0 || ++pch == 0) goto done; + if (pch == 0 || ++pch == 0) return 0; add2 = atoi(pch); pch = strpbrk(pch,"."); - if (pch == 0 || ++pch == 0) goto done; + if (pch == 0 || ++pch == 0) return 0; add3 = atoi(pch); pch = strpbrk(pch,"."); - if (pch == 0 || ++pch == 0) goto done; + if (pch == 0 || ++pch == 0) return 0; add4 = atoi(pch); -done: + if (!add1 || (add1|add2|add3|add4) > 255) return 0; + add->s_addr=(add4<<24)+(add3<<16)+(add2<<8)+add1; return 1; -- cgit v1.2.3