From 9055724a92433ffa4c36f93d918ee1b3dfa1d6f7 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 22 Apr 2006 15:10:30 +0000 Subject: * argp/argp.h (__option_is_short): Check upper limit of __key. isprint() requires its argument to have the value of an unsigned char or EOF. Patch by Sergey Poznyakoff . --- ChangeLog | 7 +++++++ argp/argp.h | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9f1cc2e94..10daff82bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-04-21 Jakub Jelinek + + * argp/argp.h (__option_is_short): Check upper limit of + __key. isprint() requires its argument to have the value + of an unsigned char or EOF. + Patch by Sergey Poznyakoff . + 2006-04-21 Ulrich Drepper [BZ #2534, BZ #2535] diff --git a/argp/argp.h b/argp/argp.h index f310193458..3a5cb01fd8 100644 --- a/argp/argp.h +++ b/argp/argp.h @@ -1,5 +1,5 @@ /* Hierarchial argument parsing, layered over getopt. - Copyright (C) 1995-1999,2003,2004,2005 Free Software Foundation, Inc. + Copyright (C) 1995-1999,2003,2004,2005,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . @@ -24,6 +24,7 @@ #include #include #include +#include #define __need_error_t #include @@ -574,7 +575,7 @@ __NTH (__option_is_short (__const struct argp_option *__opt)) else { int __key = __opt->key; - return __key > 0 && isprint (__key); + return __key > 0 && __key <= UCHAR_MAX && isprint (__key); } } -- cgit 1.4.1