summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-04-16 13:15:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-16 13:15:13 -0700
commit8266cf94d399e2bf9f787ac9d6a5ecbfb5af3f5d (patch)
tree5b26e04c658cd333949cd83388707e6f404b061b
parent307d1c982d6be312ef91c12c17a8feeae6b7987b (diff)
parentff219e57c0ffe5ac2816f79677ce4f1afa677277 (diff)
downloadbionic-8266cf94d399e2bf9f787ac9d6a5ecbfb5af3f5d.zip
bionic-8266cf94d399e2bf9f787ac9d6a5ecbfb5af3f5d.tar.gz
bionic-8266cf94d399e2bf9f787ac9d6a5ecbfb5af3f5d.tar.bz2
am ff219e57: am 6435d27f: Merge "bionic: fix NULL parameter failure in getcwd()"
* commit 'ff219e57c0ffe5ac2816f79677ce4f1afa677277': bionic: fix NULL parameter failure in getcwd()
-rw-r--r--libc/unistd/getcwd.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libc/unistd/getcwd.c b/libc/unistd/getcwd.c
index 1cf80e9..1172445 100644
--- a/libc/unistd/getcwd.c
+++ b/libc/unistd/getcwd.c
@@ -26,10 +26,15 @@
* SUCH DAMAGE.
*/
#include <unistd.h>
+#include <errno.h>
extern int __getcwd(char * buf, size_t size);
char *getcwd(char *buf, size_t size)
{
+ if (buf == NULL || size == 0) {
+ errno = EINVAL;
+ return NULL;
+ }
return ( __getcwd(buf, size) < 0 ) ? NULL : buf;
}