diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-03-05 14:32:11 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-03-05 14:32:11 +0000 |
| commit | ad792af765438804272da2cc9e268e06e190c578 (patch) | |
| tree | 6205dc4883c074c5efb9b404d1905a4d1c46e815 | |
| parent | 346af50a0857a27e5c133be2ad7ac6e074f85f51 (diff) | |
| download | glibc-ad792af765438804272da2cc9e268e06e190c578.tar.gz glibc-ad792af765438804272da2cc9e268e06e190c578.tar.xz glibc-ad792af765438804272da2cc9e268e06e190c578.zip | |
Update.
1999-03-05 Andreas Jaeger <aj@arthur.rhein-neckar.de> * resolv/inet_addr.c (inet_aton): Don't allow componets > 255. Patch by Bruno Haible <haible@ilog.fr> [PR libc/1010].
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | resolv/inet_addr.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 6883430222..60ba9d7133 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-03-05 Andreas Jaeger <aj@arthur.rhein-neckar.de> + + * resolv/inet_addr.c (inet_aton): Don't allow componets > + 255. Patch by Bruno Haible <haible@ilog.fr> [PR libc/1010]. + 1999-03-05 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/dl-machine.c (__elf_machine_runtime_setup): diff --git a/resolv/inet_addr.c b/resolv/inet_addr.c index 0d3ba068d5..a5667eb6ed 100644 --- a/resolv/inet_addr.c +++ b/resolv/inet_addr.c @@ -187,19 +187,20 @@ inet_aton(cp, addr) break; case 2: /* a.b -- 8.24 bits */ - if (val > 0xffffff) + if (parts[0] > 0xff || val > 0xffffff) goto ret_0; val |= parts[0] << 24; break; case 3: /* a.b.c -- 8.8.16 bits */ - if (val > 0xffff) + if (parts[0] > 0xff || parts[1] > 0xff || val > 0xffff) goto ret_0; val |= (parts[0] << 24) | (parts[1] << 16); break; case 4: /* a.b.c.d -- 8.8.8.8 bits */ - if (val > 0xff) + if (parts[0] > 0xff || parts[1] > 0xff || parts[2] > 0xff + || val > 0xff) goto ret_0; val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8); break; |