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

diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index e28a7bc..5342a02 100644 (file)
--- 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;