diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-27 03:29:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-27 03:29:35 -0700 |
| commit | cdb68bf8ce26448cfe173d86f1c074e167c3420f (patch) | |
| tree | 1b726243e78842727d932bd197010441589232fc | |
| parent | 5c106fcaa5b9d0a3ebeb2e8cdca589129d6a7ebd (diff) | |
| parent | 2735b33519595da5d51b79757ccce730021a9228 (diff) | |
| download | bionic-cdb68bf8ce26448cfe173d86f1c074e167c3420f.tar.gz | |
Merge change 2470 into donut
* changes:
Fix getservent() so that it returns s_port in network byte order. Also add a new document detailing known issues in the C library.
| -rw-r--r-- | libc/docs/ISSUES.TXT | 20 | ||||
| -rw-r--r-- | libc/netbsd/net/getservent.c | 9 |
2 files changed, 27 insertions, 2 deletions
diff --git a/libc/docs/ISSUES.TXT b/libc/docs/ISSUES.TXT new file mode 100644 index 000000000..b53eb16dd --- /dev/null +++ b/libc/docs/ISSUES.TXT @@ -0,0 +1,20 @@ +Bionic C Library Issues: +======================== + +This document lists important known issues of various releases +of the Bionic C library. Note that these differ from specific +implementation choices that are documented in the OVERVIEW.TXT +document. + +Currently known issues: +----------------------- + +- The C library initialization will improperly run static C++ + constructors located in shared libraries twice. + +Android-1.5 issues: +------------------- + +- getservbyname() returned the port number in the s_port field of + the 'struct servent' structure in host-byte-order, instead of + network-byte-order. diff --git a/libc/netbsd/net/getservent.c b/libc/netbsd/net/getservent.c index 45207dfab..65fbd7e97 100644 --- a/libc/netbsd/net/getservent.c +++ b/libc/netbsd/net/getservent.c @@ -27,6 +27,7 @@ */ #include <sys/cdefs.h> #include <sys/types.h> +#include <sys/endian.h> #include <netdb.h> #include "servent.h" #include "services.h" @@ -54,6 +55,7 @@ getservent_r( res_static rs ) int namelen; int nn,count; int total = 0; + int port; char* p2; p = rs->servent_ptr; @@ -92,9 +94,12 @@ getservent_r( res_static rs ) memcpy( rs->servent.s_name, p+1, namelen ); rs->servent.s_name[namelen] = 0; p += 1 + namelen; - rs->servent.s_port = ((((unsigned char*)p)[0] << 8) | - ((unsigned char*)p)[1]); + /* s_port must be in network byte order */ + port = ((((unsigned char*)p)[0] << 8) | + ((unsigned char*)p)[1]); + + rs->servent.s_port = htons(port); rs->servent.s_proto = p[2] == 't' ? "tcp" : "udp"; p += 4; /* skip port(2) + proto(1) + aliascount(1) */ |