generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pull in upstream fixes to reject invalid bases.

Browse Source 
Also add tests to make sure the full set works correctly.

Change-Id: I3e7f237f12c9c93e1185a97c9717803e7e55a73c
This commit is contained in:
Elliott Hughes
2014-09-23 14:53:10 -07:00
parent 8642165344
commit b05ec5ae93
9 changed files with 232 additions and 23 deletions
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++;