Change 18422 by jhi@lyta on 2003/01/04 03:04:29
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.
Affected files ...
... //depot/maint-5.8/perl/reentr.c#3 edit
... //depot/maint-5.8/perl/reentr.h#2 edit
... //depot/maint-5.8/perl/reentr.pl#3 edit
Differences ...
==== //depot/maint-5.8/perl/reentr.c#3 (text) ====
Index: perl/reentr.c
--- perl/reentr.c#2~18080~ Sun Nov 3 21:23:04 2002
+++ perl/reentr.c Fri Jan 3 19:04:29 2003
@@ -35,10 +35,10 @@
#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;
@@ -93,7 +93,7 @@
#endif /* HAS_GETSERVBYNAME_R */
#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);
+ PL_reentrant_buffer->_pwent_size = sysconf(_SC_GETPW_R_SIZE_MAX);
if (PL_reentrant_buffer->_pwent_size == -1)
PL_reentrant_buffer->_pwent_size = REENTRANTUSUALSIZE;
# else
@@ -342,10 +342,10 @@
case OP_GHOSTENT:
retptr = gethostent(); break;
default:
+ SETERRNO(ERANGE, LIB_INVARG);
break;
}
}
- SETERRNO(ERANGE, LIB_INVARG);
}
break;
#endif
@@ -373,10 +373,10 @@
case OP_GGRENT:
retptr = getgrent(); break;
default:
+ SETERRNO(ERANGE, LIB_INVARG);
break;
}
}
- SETERRNO(ERANGE, LIB_INVARG);
}
break;
#endif
@@ -405,10 +405,10 @@
case OP_GNETENT:
retptr = getnetent(); break;
default:
+ SETERRNO(ERANGE, LIB_INVARG);
break;
}
}
- SETERRNO(ERANGE, LIB_INVARG);
}
break;
#endif
@@ -436,6 +436,7 @@
case OP_GPWENT:
retptr = getpwent(); break;
default:
+ SETERRNO(ERANGE, LIB_INVARG);
break;
}
}
@@ -465,10 +466,10 @@
case OP_GPROTOENT:
retptr = getprotoent(); break;
default:
+ SETERRNO(ERANGE, LIB_INVARG);
break;
}
}
- SETERRNO(ERANGE, LIB_INVARG);
}
break;
#endif
@@ -497,10 +498,10 @@
case OP_GSERVENT:
retptr = getservent(); break;
default:
+ SETERRNO(ERANGE, LIB_INVARG);
break;
}
}
- SETERRNO(ERANGE, LIB_INVARG);
}
break;
#endif
==== //depot/maint-5.8/perl/reentr.pl#3 (text) ====
Index: perl/reentr.pl
--- perl/reentr.pl#2~18080~ Sun Nov 3 21:23:04 2002
+++ perl/reentr.pl Fri Jan 3 19:04:29 2003
@@ -493,28 +493,23 @@
$seent{$func}* _${genfunc}_ptr;
# endif
EOF
- if ($genfunc eq 'getspent') {
- push @size, <<EOF;
- PL_reentrant_buffer->_${genfunc}_size = 1024;
-EOF
- } else {
- push @struct, <<EOF;
+ push @struct, <<EOF;
# ifdef USE_${GENFUNC}_FPTR
FILE* _${genfunc}_fptr;
# endif
EOF
- push @init, <<EOF;
+ push @init, <<EOF;
# ifdef USE_${GENFUNC}_FPTR
PL_reentrant_buffer->_${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' ?
+ my $sz = $genfunc eq 'grent' ?
'_grent_size' : '_pwent_size';
- push @size, <<EOF;
+ push @size, <<EOF;
# if defined(HAS_SYSCONF) && defined($sc) && !defined(__GLIBC__)
- PL_reentrant_buffer->_${genfunc}_size = sysconf($sc);
+ PL_reentrant_buffer->$sz = sysconf($sc);
if (PL_reentrant_buffer->$sz == -1)
PL_reentrant_buffer->$sz = REENTRANTUSUALSIZE;
# else
@@ -529,7 +524,6 @@
# endif
# endif
EOF
- }
pushinitfree $genfunc;
pushssif $endif;
}
@@ -814,6 +808,7 @@
case OP_GHOSTENT:
retptr = gethostent(); break;
default:
+ SETERRNO(ERANGE, LIB_INVARG);
break;
}
}
@@ -844,6 +839,7 @@
case OP_GGRENT:
retptr = getgrent(); break;
default:
+ SETERRNO(ERANGE, LIB_INVARG);
break;
}
}
@@ -875,10 +871,10 @@
case OP_GNETENT:
retptr = getnetent(); break;
default:
+ SETERRNO(ERANGE, LIB_INVARG);
break;
}
}
- SETERRNO(ERANGE, LIB_INVARG);
}
break;
#endif
@@ -906,10 +902,10 @@
case OP_GPWENT:
retptr = getpwent(); break;
default:
+ SETERRNO(ERANGE, LIB_INVARG);
break;
}
}
- SETERRNO(ERANGE, LIB_INVARG);
}
break;
#endif
@@ -936,10 +932,10 @@
case OP_GPROTOENT:
retptr = getprotoent(); break;
default:
+ SETERRNO(ERANGE, LIB_INVARG);
break;
}
}
- SETERRNO(ERANGE, LIB_INVARG);
}
break;
#endif
@@ -968,10 +964,10 @@
case OP_GSERVENT:
retptr = getservent(); break;
default:
+ SETERRNO(ERANGE, LIB_INVARG);
break;
}
}
- SETERRNO(ERANGE, LIB_INVARG);
}
break;
#endif
End of Patch.
