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

Merge "Disable %n in printf and vfwprintf."

Browse Source
This commit is contained in:
Elliott Hughes
2014-05-05 21:49:22 +00:00
committed by Gerrit Code Review
parent 8ec21d9ded e2341d08fa
commit ad534985ec
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libc/upstream-openbsd/lib/libc/stdio/vfprintf.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: vfprintf.c,v 1.65 2014/03/19 05:17:01 guenther Exp $ */
/* $OpenBSD: vfprintf.c,v 1.66 2014/05/03 12:36:45 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -801,6 +801,7 @@ fp_common:
}
break;
#endif /* FLOATING_POINT */
#ifndef NO_PRINTF_PERCENT_N
case 'n':
if (flags & LLONGINT)
*GETARG(long long *) = ret;
@@ -819,6 +820,7 @@ fp_common:
else
*GETARG(int *) = ret;
continue; /* no output */
#endif /* NO_PRINTF_PERCENT_N */
case 'O':
flags |= LONGINT;
/*FALLTHROUGH*/
@@ -1317,6 +1319,7 @@ reswitch: switch (ch) {
ADDTYPE(T_DOUBLE);
break;
#endif /* FLOATING_POINT */
#ifndef NO_PRINTF_PERCENT_N
case 'n':
if (flags & LLONGINT)
ADDTYPE(TP_LLONG);
@@ -1333,6 +1336,7 @@ reswitch: switch (ch) {
else
ADDTYPE(TP_INT);
continue; /* no output */
#endif /* NO_PRINTF_PERCENT_N */
case 'O':
flags |= LONGINT;
/*FALLTHROUGH*/

6
libc/upstream-openbsd/lib/libc/stdio/vfwprintf.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: vfwprintf.c,v 1.9 2014/03/19 05:17:01 guenther Exp $ */
/* $OpenBSD: vfwprintf.c,v 1.10 2014/05/03 12:36:45 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -784,6 +784,7 @@ fp_common:
}
break;
#endif /* FLOATING_POINT */
#ifndef NO_PRINTF_PERCENT_N
case 'n':
if (flags & LLONGINT)
*GETARG(long long *) = ret;
@@ -802,6 +803,7 @@ fp_common:
else
*GETARG(int *) = ret;
continue; /* no output */
#endif /* NO_PRINTF_PERCENT_N */
case 'O':
flags |= LONGINT;
/*FALLTHROUGH*/
@@ -1296,6 +1298,7 @@ reswitch: switch (ch) {
ADDTYPE(T_DOUBLE);
break;
#endif /* FLOATING_POINT */
#ifndef NO_PRINTF_PERCENT_N
case 'n':
if (flags & LLONGINT)
ADDTYPE(TP_LLONG);
@@ -1312,6 +1315,7 @@ reswitch: switch (ch) {
else
ADDTYPE(TP_INT);
continue; /* no output */
#endif /* NO_PRINTF_PERCENT_N */
case 'O':
flags |= LONGINT;
/*FALLTHROUGH*/