This is the mail archive of the libc-hacker@sourceware.org mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
Hi! The BZ #5607 namespace cleanups broke this junk header when not compiled with -D_GNU_SOURCE, as can be seen e.g. on: #include <stdlib.h> #include <string.h> #define INIT unsigned char *curp = (unsigned char *) instring; #define GETC() (*curp++) #define PEEKC() (*curp) #define UNGETC(c) (curp--) #define RETURN(c) return (char *) (c) #define ERROR(c) abort () #include <regexp.h> int main (void) { char buf[8 * sizeof (regex_t)]; char *p = compile ("foo", buf, buf + sizeof buf, -1); if ((unsigned long) p < 100) return 1; if (step ("barfoobaz", buf) != 1) return 1; if (strcmp (loc1, "foobaz") || strcmp (loc2, "baz")) return 1; p = compile ("", buf, buf + sizeof buf, -1); if ((unsigned long) p < 100) return 1; if (step ("bar", buf) != 1) return 1; if (strcmp (loc1, "bar") || strcmp (loc2, "bar")) return 1; return 0; } The following patch fixes that as well as a segfault when the pattern is an empty string. 2008-06-05 Jakub Jelinek <jakub@redhat.com> * misc/regexp.h (compile): Use __REPB_PREFIX macro. Avoid segfault if first GETC returns eof/'\0'/'\n'. --- libc/misc/regexp.h.jj 2004-05-19 18:52:44.000000000 +0200 +++ libc/misc/regexp.h 2008-06-05 21:40:33.000000000 +0200 @@ -1,4 +1,5 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2004, 2008 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -129,8 +130,9 @@ compile (char *__restrict instring, char __expr_ptr = (regex_t *) expbuf; /* The remaining space in the buffer can be used for the compiled pattern. */ - __expr_ptr->buffer = expbuf + sizeof (regex_t); - __expr_ptr->allocated = endbuf - (char *) __expr_ptr->buffer; + __expr_ptr->__REPB_PREFIX (buffer) = expbuf + sizeof (regex_t); + __expr_ptr->__REPB_PREFIX (allocated) + = endbuf - (char *) __expr_ptr->__REPB_PREFIX (buffer); while ((__ch = (GETC ())) != eof) { @@ -162,7 +164,10 @@ compile (char *__restrict instring, char } __input_buffer[__current_size++] = __ch; } - __input_buffer[__current_size++] = '\0'; + if (__current_size) + __input_buffer[__current_size++] = '\0'; + else + __input_buffer = ""; /* Now compile the pattern. */ __error = regcomp (__expr_ptr, __input_buffer, REG_NEWLINE); @@ -198,7 +203,8 @@ compile (char *__restrict instring, char } /* Everything is ok. */ - RETURN ((char *) (__expr_ptr->buffer + __expr_ptr->used)); + RETURN ((char *) (__expr_ptr->__REPB_PREFIX (buffer) + + __expr_ptr->__REPB_PREFIX (used))); } #endif Jakub
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |