From: Rafael Garcia-Suarez Date: Thu, 16 Jan 2003 20:48:10 +0000 (+0000) Subject: Integrate changes #18422 and #18423 from maint-5.8. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0de8cad8cba777e31f98ef8b8ac579070f7c78a6;p=p5sagit%2Fp5-mst-13.2.git Integrate changes #18422 and #18423 from maint-5.8. 18422 : Third Degree found a read of uninit memory (after setting grent_size with sysconf(), pwent_size was read). Also make the ERANGE/INVARG more consistent. 18423 : spent_size was still off. (As far as I can tell _SC_GETPW_R_SIZE_MAX is supposed to be used also for spents, not just pwents.) p4raw-link: @18422 on //depot/maint-5.8/perl: c45c44aa17d6498a967957363477eb572b803726 p4raw-id: //depot/perl@18498 p4raw-integrated: from //depot/maint-5.8/perl@18497 'copy in' reentr.h (@17645..) reentr.c reentr.pl (@18422..) --- diff --git a/reentr.c b/reentr.c index 35a1e91..052af90 100644 --- a/reentr.c +++ b/reentr.c @@ -35,10 +35,10 @@ Perl_reentrant_size(pTHX) { #ifdef HAS_DRAND48_R #endif /* HAS_DRAND48_R */ #ifdef HAS_GETGRNAM_R -# if defined(HAS_SYSCONF) && defined(_SC_GETPW_R_SIZE_MAX) && !defined(__GLIBC__) - PL_reentrant_buffer->_grent_size = sysconf(_SC_GETPW_R_SIZE_MAX); - if (PL_reentrant_buffer->_pwent_size == -1) - PL_reentrant_buffer->_pwent_size = REENTRANTUSUALSIZE; +# if defined(HAS_SYSCONF) && defined(_SC_GETGR_R_SIZE_MAX) && !defined(__GLIBC__) + PL_reentrant_buffer->_grent_size = sysconf(_SC_GETGR_R_SIZE_MAX); + if (PL_reentrant_buffer->_grent_size == -1) + PL_reentrant_buffer->_grent_size = REENTRANTUSUALSIZE; # else # if defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ) PL_reentrant_buffer->_grent_size = SIABUFSIZ; @@ -94,8 +94,8 @@ Perl_reentrant_size(pTHX) { #ifdef HAS_GETSPNAM_R # if defined(HAS_SYSCONF) && defined(_SC_GETPW_R_SIZE_MAX) && !defined(__GLIBC__) PL_reentrant_buffer->_spent_size = sysconf(_SC_GETPW_R_SIZE_MAX); - if (PL_reentrant_buffer->_pwent_size == -1) - PL_reentrant_buffer->_pwent_size = REENTRANTUSUALSIZE; + if (PL_reentrant_buffer->_spent_size == -1) + PL_reentrant_buffer->_spent_size = REENTRANTUSUALSIZE; # else # if defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ) PL_reentrant_buffer->_spent_size = SIABUFSIZ; @@ -342,10 +342,10 @@ Perl_reentrant_retry(const char *f, ...) case OP_GHOSTENT: retptr = gethostent(); break; default: + SETERRNO(ERANGE, LIB_INVARG); break; } } - SETERRNO(ERANGE, LIB_INVARG); } break; #endif @@ -373,10 +373,10 @@ Perl_reentrant_retry(const char *f, ...) case OP_GGRENT: retptr = getgrent(); break; default: + SETERRNO(ERANGE, LIB_INVARG); break; } } - SETERRNO(ERANGE, LIB_INVARG); } break; #endif @@ -405,10 +405,10 @@ Perl_reentrant_retry(const char *f, ...) case OP_GNETENT: retptr = getnetent(); break; default: + SETERRNO(ERANGE, LIB_INVARG); break; } } - SETERRNO(ERANGE, LIB_INVARG); } break; #endif @@ -436,6 +436,7 @@ Perl_reentrant_retry(const char *f, ...) case OP_GPWENT: retptr = getpwent(); break; default: + SETERRNO(ERANGE, LIB_INVARG); break; } } @@ -465,10 +466,10 @@ Perl_reentrant_retry(const char *f, ...) case OP_GPROTOENT: retptr = getprotoent(); break; default: + SETERRNO(ERANGE, LIB_INVARG); break; } } - SETERRNO(ERANGE, LIB_INVARG); } break; #endif @@ -497,10 +498,10 @@ Perl_reentrant_retry(const char *f, ...) case OP_GSERVENT: retptr = getservent(); break; default: + SETERRNO(ERANGE, LIB_INVARG); break; } } - SETERRNO(ERANGE, LIB_INVARG); } break; #endif diff --git a/reentr.pl b/reentr.pl index 85ec64a..6b23aa8 100644 --- a/reentr.pl +++ b/reentr.pl @@ -493,43 +493,36 @@ EOF $seent{$func}* _${genfunc}_ptr; # endif EOF - if ($genfunc eq 'getspent') { - push @size, <_${genfunc}_size = 1024; -EOF - } else { - push @struct, <_${genfunc}_fptr = NULL; # endif EOF - my $sc = $genfunc eq 'getgrent' ? + my $sc = $genfunc eq 'grent' ? '_SC_GETGR_R_SIZE_MAX' : '_SC_GETPW_R_SIZE_MAX'; - my $sz = $genfunc eq 'getgrent' ? - '_grent_size' : '_pwent_size'; - push @size, <_${genfunc}_size = sysconf($sc); + PL_reentrant_buffer->$sz = sysconf($sc); if (PL_reentrant_buffer->$sz == -1) PL_reentrant_buffer->$sz = REENTRANTUSUALSIZE; # else # if defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ) - PL_reentrant_buffer->_${genfunc}_size = SIABUFSIZ; + PL_reentrant_buffer->$sz = SIABUFSIZ; # else # ifdef __sgi - PL_reentrant_buffer->_${genfunc}_size = BUFSIZ; + PL_reentrant_buffer->$sz = BUFSIZ; # else - PL_reentrant_buffer->_${genfunc}_size = REENTRANTUSUALSIZE; + PL_reentrant_buffer->$sz = REENTRANTUSUALSIZE; # endif # endif # endif EOF - } pushinitfree $genfunc; pushssif $endif; } @@ -814,6 +807,7 @@ Perl_reentrant_retry(const char *f, ...) case OP_GHOSTENT: retptr = gethostent(); break; default: + SETERRNO(ERANGE, LIB_INVARG); break; } } @@ -844,6 +838,7 @@ Perl_reentrant_retry(const char *f, ...) case OP_GGRENT: retptr = getgrent(); break; default: + SETERRNO(ERANGE, LIB_INVARG); break; } } @@ -875,10 +870,10 @@ Perl_reentrant_retry(const char *f, ...) case OP_GNETENT: retptr = getnetent(); break; default: + SETERRNO(ERANGE, LIB_INVARG); break; } } - SETERRNO(ERANGE, LIB_INVARG); } break; #endif @@ -906,10 +901,10 @@ Perl_reentrant_retry(const char *f, ...) case OP_GPWENT: retptr = getpwent(); break; default: + SETERRNO(ERANGE, LIB_INVARG); break; } } - SETERRNO(ERANGE, LIB_INVARG); } break; #endif @@ -936,10 +931,10 @@ Perl_reentrant_retry(const char *f, ...) case OP_GPROTOENT: retptr = getprotoent(); break; default: + SETERRNO(ERANGE, LIB_INVARG); break; } } - SETERRNO(ERANGE, LIB_INVARG); } break; #endif @@ -968,10 +963,10 @@ Perl_reentrant_retry(const char *f, ...) case OP_GSERVENT: retptr = getservent(); break; default: + SETERRNO(ERANGE, LIB_INVARG); break; } } - SETERRNO(ERANGE, LIB_INVARG); } break; #endif