* Makefile.in (VERSION): Bump to 4.5.7.

	* cplus-dem.c (demangle_args):  Validate index for previously
	seen type to guard against bogus values from malformed manglings.
	* valops.c (value_struct_elt_for_reference):  Guard against
	blindly using NULL return value from lookup_symbol.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 02d7e1e50c496f9b964bac1e417d33cbf12a9bd6..758110cb0c2c86c27448ed36dfd9204d03f5b185 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+Sun Jul  5 09:43:28 1992  Fred Fish  (fnf@cygnus.com)
+
+       * Makefile.in (VERSION):  Bump to 4.5.7.
+       * cplus-dem.c (demangle_args):  Validate index for previously
+       seen type to guard against bogus values from malformed manglings.
+       * valops.c (value_struct_elt_for_reference):  Guard against
+       blindly using NULL return value from lookup_symbol.
+
 Sun Jul  5 09:46:43 1992  Stu Grossman  (grossman at cygnus.com)
 
        * cadillac.c, cadillac-patches:  Rename to energize.c and

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 3b76f6a9c8b72e3c93c4231add832463537be4ab..6c999445580ef5c5fbb14ec97b3801bf703ca790 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -162,7 +162,7 @@ CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${MMALLOC_LIB} ${LIBIBERTY} \
 ADD_FILES = ${REGEX} ${ALLOCA} ${XM_ADD_FILES} ${TM_ADD_FILES}
 ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES}
 
-VERSION = 4.5.6
+VERSION = 4.5.7
 DIST=gdb
 
 LINT=/usr/5bin/lint

diff --git a/gdb/cplus-dem.c b/gdb/cplus-dem.c
index 911e1b2c731950fdbb47ffe9668e4685a5184b28..f3b3d88a2a0803e4ff366a09e342b989d724e197 100644 (file)
--- a/gdb/cplus-dem.c
+++ b/gdb/cplus-dem.c
@@ -1578,7 +1578,9 @@ demangle_args (declp, type, work)
 #ifdef ARM_DEMANGLING
          t--;
 #endif
-         if (t >= work -> ntypes)
+         /* Validate the type index.  Protect against illegal indices from
+            malformed type strings. */
+         if ((t < 0) || (t >= work -> ntypes))
            {
              return (0);
            }