FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check for negative argument in Type.template_argument

Browse source 
typy_template_argument did not check if the template argument was
non-negative.  A negative value could cause a gdb crash.

2018-09-23  Tom Tromey  <tom@tromey.com>

	PR python/17284:
	* python/py-type.c (typy_template_argument): Check for negative
	argument number.

gdb/testsuite/ChangeLog
2018-09-23  Tom Tromey  <tom@tromey.com>

	PR python/17284:
	* gdb.python/py-template.exp (test_template_arg): Add test for
	negative template argument number.
This commit is contained in:
Tom Tromey 2018-09-15 00:29:20 -06:00
parent 39a24317ac
commit fd3ba736db
4 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
2018-09-23 Tom Tromey <tom@tromey.com>
PR python/17284:
* python/py-type.c (typy_template_argument): Check for negative
argument number.
2018-09-23 Tom Tromey <tom@tromey.com> 2018-09-23 Tom Tromey <tom@tromey.com>
PR python/14062: PR python/14062:

7
gdb/python/py-type.c
View file

@ -930,6 +930,13 @@ typy_template_argument (PyObject *self, PyObject *args)
if (! PyArg_ParseTuple (args, "i|O", &argno, &block_obj)) if (! PyArg_ParseTuple (args, "i|O", &argno, &block_obj))
return NULL; return NULL;
if (argno < 0)
{
PyErr_SetString (PyExc_RuntimeError,
_("Template argument number must be non-negative"));
return NULL;
}
if (block_obj) if (block_obj)
{ {
block = block_object_to_block (block_obj); block = block_object_to_block (block_obj);

6
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,9 @@
2018-09-23 Tom Tromey <tom@tromey.com>
PR python/17284:
* gdb.python/py-template.exp (test_template_arg): Add test for
negative template argument number.
2018-09-23 Tom Tromey <tom@tromey.com> 2018-09-23 Tom Tromey <tom@tromey.com>
PR python/14062: PR python/14062:

4
gdb/testsuite/gdb.python/py-template.exp
View file

@ -54,6 +54,10 @@ proc test_template_arg {exefile type} {
# Replace '*' with '\*' in regex. # Replace '*' with '\*' in regex.
regsub -all {\*} $type {\*} t regsub -all {\*} $type {\*} t
gdb_test "python print (foo.type.template_argument(0))" $t $type gdb_test "python print (foo.type.template_argument(0))" $t $type
gdb_test "python print(foo.type.template_argument(-1))" \
"Template argument number must be non-negative\r\nError while executing Python code." \
"negative template argument number"
} }
test_template_arg "${binfile}-ci" "const int" test_template_arg "${binfile}-ci" "const int"