tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Pull in upstream fixes to reject invalid bases."

Browse source
This commit is contained in:
Elliott Hughes 2014-09-23 21:59:15 +00:00 committed by Gerrit Code Review
commit 87b6906f6e
9 changed files with 232 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libc/upstream-openbsd/lib/libc/stdlib/strtoimax.c
View file

@ -1,6 +1,5 @@
/* $OpenBSD: strtoimax.c,v 1.1 2006/01/13 17:58:09 millert Exp $ */
/*-
/* $OpenBSD: strtoimax.c,v 1.2 2014/09/13 20:10:12 schwarze Exp $ */
/*
* Copyright (c) 1992 The Regents of the University of California.
* All rights reserved.
*
@ -47,6 +46,17 @@ strtoimax(const char *nptr, char **endptr, int base)
int c;
int neg, any, cutlim;
/*
* Ensure that base is between 2 and 36 inclusive, or the special
* value of 0.
*/
if (base < 0 || base == 1 || base > 36) {
if (endptr != 0)
*endptr = (char *)nptr;
errno = EINVAL;
return 0;
}
/*
* Skip white space and pick up leading +/- sign if any.
* If base is 0, allow 0x for hex and 0 for octal, else

7
libc/upstream-openbsd/lib/libc/stdlib/strtol.c
View file

@ -1,5 +1,5 @@
/* $OpenBSD: strtol.c,v 1.9 2013/04/17 17:40:35 tedu Exp $ */
/*-
/* $OpenBSD: strtol.c,v 1.10 2014/09/13 20:10:12 schwarze Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
@ -33,7 +33,6 @@
#include <limits.h>
#include <stdlib.h>
/*
* Convert a string to a long integer.
*
@ -52,7 +51,7 @@ strtol(const char *nptr, char **endptr, int base)
* Ensure that base is between 2 and 36 inclusive, or the special
* value of 0.
*/
if (base != 0 && (base < 2 || base > 36)) {
if (base < 0 || base == 1 || base > 36) {
if (endptr != 0)
*endptr = (char *)nptr;
errno = EINVAL;

15
libc/upstream-openbsd/lib/libc/stdlib/strtoll.c
View file

@ -1,5 +1,5 @@
/* $OpenBSD: strtoll.c,v 1.7 2013/03/28 18:09:38 martynas Exp $ */
/*-
/* $OpenBSD: strtoll.c,v 1.8 2014/09/13 20:10:12 schwarze Exp $ */
/*
* Copyright (c) 1992 The Regents of the University of California.
* All rights reserved.
*
@ -49,6 +49,17 @@ strtoll(const char *nptr, char **endptr, int base)
int c;
int neg, any, cutlim;
/*
* Ensure that base is between 2 and 36 inclusive, or the special
* value of 0.
*/
if (base < 0 || base == 1 || base > 36) {
if (endptr != 0)
*endptr = (char *)nptr;
errno = EINVAL;
return 0;
}
/*
* Skip white space and pick up leading +/- sign if any.
* If base is 0, allow 0x for hex and 0 for octal, else

11
libc/upstream-openbsd/lib/libc/stdlib/strtoul.c
View file

@ -1,6 +1,6 @@
/* $OpenBSD: strtoul.c,v 1.8 2013/04/17 17:40:35 tedu Exp $ */
/* $OpenBSD: strtoul.c,v 1.9 2014/09/13 20:10:12 schwarze Exp $ */
/*
* Copyright (c) 1990 Regents of the University of California.
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -50,6 +50,13 @@ strtoul(const char *nptr, char **endptr, int base)
/*
* See strtol for comments as to the logic used.
*/
if (base < 0 || base == 1 || base > 36) {
if (endptr != 0)
*endptr = (char *)nptr;
errno = EINVAL;
return 0;
}
s = nptr;
do {
c = (unsigned char) *s++;

15
libc/upstream-openbsd/lib/libc/stdlib/strtoull.c
View file

@ -1,5 +1,5 @@
/* $OpenBSD: strtoull.c,v 1.6 2013/03/28 18:09:38 martynas Exp $ */
/*-
/* $OpenBSD: strtoull.c,v 1.7 2014/09/13 20:10:12 schwarze Exp $ */
/*
* Copyright (c) 1992 The Regents of the University of California.
* All rights reserved.
*
@ -50,8 +50,15 @@ strtoull(const char *nptr, char **endptr, int base)
int neg, any, cutlim;
/*
* See strtoq for comments as to the logic used.
* See strtoll for comments as to the logic used.
*/
if (base < 0 || base == 1 || base > 36) {
if (endptr != 0)
*endptr = (char *)nptr;
errno = EINVAL;
return 0;
}
s = nptr;
do {
c = (unsigned char) *s++;
@ -59,7 +66,7 @@ strtoull(const char *nptr, char **endptr, int base)
if (c == '-') {
neg = 1;
c = *s++;
} else {
} else {
neg = 0;
if (c == '+')
c = *s++;

16
libc/upstream-openbsd/lib/libc/stdlib/strtoumax.c
View file

@ -1,6 +1,5 @@
/* $OpenBSD: strtoumax.c,v 1.1 2006/01/13 17:58:09 millert Exp $ */
/*-
/* $OpenBSD: strtoumax.c,v 1.2 2014/09/13 20:10:12 schwarze Exp $ */
/*
* Copyright (c) 1992 The Regents of the University of California.
* All rights reserved.
*
@ -48,8 +47,15 @@ strtoumax(const char *nptr, char **endptr, int base)
int neg, any, cutlim;
/*
* See strtoq for comments as to the logic used.
* See strtoimax for comments as to the logic used.
*/
if (base < 0 || base == 1 || base > 36) {
if (endptr != 0)
*endptr = (char *)nptr;
errno = EINVAL;
return 0;
}
s = nptr;
do {
c = (unsigned char) *s++;
@ -57,7 +63,7 @@ strtoumax(const char *nptr, char **endptr, int base)
if (c == '-') {
neg = 1;
c = *s++;
} else {
} else {
neg = 0;
if (c == '+')
c = *s++;

55
tests/inttypes_test.cpp
View file

@ -14,11 +14,12 @@
* limitations under the License.
*/
#include <gtest/gtest.h>
#include <stdio.h>
#include <inttypes.h>
#include <errno.h>
#include <gtest/gtest.h>
#include <stdio.h>
TEST(inttypes, misc) {
char buf[512];
@ -46,3 +47,51 @@ TEST(inttypes, wcstoimax) {
TEST(inttypes, wcstoumax) {
ASSERT_EQ(123U, wcstoumax(L"123", NULL, 10));
}
TEST(inttypes, strtoimax_EINVAL) {
errno = 0;
strtoimax("123", NULL, -1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
strtoimax("123", NULL, 1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
strtoimax("123", NULL, 37);
ASSERT_EQ(EINVAL, errno);
}
TEST(inttypes, strtoumax_EINVAL) {
errno = 0;
strtoumax("123", NULL, -1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
strtoumax("123", NULL, 1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
strtoumax("123", NULL, 37);
ASSERT_EQ(EINVAL, errno);
}
TEST(inttypes, wcstoimax_EINVAL) {
errno = 0;
wcstoimax(L"123", NULL, -1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstoimax(L"123", NULL, 1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstoimax(L"123", NULL, 37);
ASSERT_EQ(EINVAL, errno);
}
TEST(inttypes, wcstoumax_EINVAL) {
errno = 0;
wcstoumax(L"123", NULL, -1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstoumax(L"123", NULL, 1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstoumax(L"123", NULL, 37);
ASSERT_EQ(EINVAL, errno);
}

48
tests/stdlib_test.cpp
View file

@ -361,3 +361,51 @@ TEST(stdlib, unlockpt_ENOTTY) {
ASSERT_EQ(ENOTTY, errno);
close(fd);
}
TEST(stdlib, strtol_EINVAL) {
errno = 0;
strtol("123", NULL, -1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
strtol("123", NULL, 1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
strtol("123", NULL, 37);
ASSERT_EQ(EINVAL, errno);
}
TEST(stdlib, strtoll_EINVAL) {
errno = 0;
strtoll("123", NULL, -1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
strtoll("123", NULL, 1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
strtoll("123", NULL, 37);
ASSERT_EQ(EINVAL, errno);
}
TEST(stdlib, strtoul_EINVAL) {
errno = 0;
strtoul("123", NULL, -1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
strtoul("123", NULL, 1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
strtoul("123", NULL, 37);
ASSERT_EQ(EINVAL, errno);
}
TEST(stdlib, strtoull_EINVAL) {
errno = 0;
strtoull("123", NULL, -1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
strtoull("123", NULL, 1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
strtoull("123", NULL, 37);
ASSERT_EQ(EINVAL, errno);
}

72
tests/wchar_test.cpp
View file

@ -520,3 +520,75 @@ TEST(stdio, open_wmemstream_EINVAL) {
GTEST_LOG_(INFO) << "This test does nothing.\n";
#endif
}
TEST(wchar, wcstol_EINVAL) {
errno = 0;
wcstol(L"123", NULL, -1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstol(L"123", NULL, 1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstol(L"123", NULL, 37);
ASSERT_EQ(EINVAL, errno);
}
TEST(wchar, wcstoll_EINVAL) {
errno = 0;
wcstoll(L"123", NULL, -1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstoll(L"123", NULL, 1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstoll(L"123", NULL, 37);
ASSERT_EQ(EINVAL, errno);
}
TEST(wchar, wcstoul_EINVAL) {
errno = 0;
wcstoul(L"123", NULL, -1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstoul(L"123", NULL, 1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstoul(L"123", NULL, 37);
ASSERT_EQ(EINVAL, errno);
}
TEST(wchar, wcstoull_EINVAL) {
errno = 0;
wcstoull(L"123", NULL, -1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstoull(L"123", NULL, 1);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstoull(L"123", NULL, 37);
ASSERT_EQ(EINVAL, errno);
}
TEST(wchar, wcstoll_l_EINVAL) {
errno = 0;
wcstoll_l(L"123", NULL, -1, LC_GLOBAL_LOCALE);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstoll_l(L"123", NULL, 1, LC_GLOBAL_LOCALE);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstoll_l(L"123", NULL, 37, LC_GLOBAL_LOCALE);
ASSERT_EQ(EINVAL, errno);
}
TEST(wchar, wcstoull_l_EINVAL) {
errno = 0;
wcstoull_l(L"123", NULL, -1, LC_GLOBAL_LOCALE);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstoull_l(L"123", NULL, 1, LC_GLOBAL_LOCALE);
ASSERT_EQ(EINVAL, errno);
errno = 0;
wcstoull_l(L"123", NULL, 37, LC_GLOBAL_LOCALE);
ASSERT_EQ(EINVAL, errno);
}