gcc-python-plugin-commits September 2011

gcc-python-plugin-commits@lists.stg.fedorahosted.org

1 participants
71 discussions

[gcc-python-plugin] cpychecker: implement Py_Initialize
by David Hugh Malcolm 06 Sep '11

06 Sep '11

commit 1248d0cb7cee2c4a3fff7cff1269b27ca03b8764 Author: David Malcolm <dmalcolm(a)redhat.com> Date: Tue Sep 6 14:45:56 2011 -0400 cpychecker: implement Py_Initialize libcpychecker/refcounts.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) --- diff --git a/libcpychecker/refcounts.py b/libcpychecker/refcounts.py index f689fff..c6decd1 100644 --- a/libcpychecker/refcounts.py +++ b/libcpychecker/refcounts.py @@ -951,6 +951,14 @@ class MyState(State): return self.make_transitions_for_fncall(stmt, s_success, s_failure) ######################################################################## + # Py_Initialize* + ######################################################################## + def impl_Py_Initialize(self, stmt): + # http://docs.python.org/c-api/init.html#Py_Initialize + # For now, treat it as a no-op: + return [self.mktrans_nop(stmt, 'Py_Initialize')] + + ######################################################################## # Py_InitModule* ######################################################################## def impl_Py_InitModule4_64(self, stmt):

1 0

[gcc-python-plugin] cpychecker: implement PyImport_AppendInittab
by David Hugh Malcolm 06 Sep '11

06 Sep '11

commit 3d51bf237e558d916afd93bcd5001ea8c5d40262 Author: David Malcolm <dmalcolm(a)redhat.com> Date: Tue Sep 6 14:43:46 2011 -0400 cpychecker: implement PyImport_AppendInittab libcpychecker/refcounts.py | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) --- diff --git a/libcpychecker/refcounts.py b/libcpychecker/refcounts.py index 997cd06..f689fff 100644 --- a/libcpychecker/refcounts.py +++ b/libcpychecker/refcounts.py @@ -940,6 +940,17 @@ class MyState(State): return [self.mktrans_nop(stmt, 'Py_Finalize')] ######################################################################## + # PyImport_* + ######################################################################## + def impl_PyImport_AppendInittab(self, stmt): + # http://docs.python.org/c-api/import.html#PyImport_AppendInittab + s_success = self.mkstate_concrete_return_of(stmt, 0) + s_failure = self.mkstate_concrete_return_of(stmt, -1) + # (doesn't set an exception on failure, and Py_Initialize shouldn't + # have been called yet, in any case) + return self.make_transitions_for_fncall(stmt, s_success, s_failure) + + ######################################################################## # Py_InitModule* ######################################################################## def impl_Py_InitModule4_64(self, stmt):

1 0

[gcc-python-plugin] cpychecker: initial implementation of Py_Finalize
by David Hugh Malcolm 06 Sep '11

06 Sep '11

commit 2d3e8f3c0072f9757eca1836074799191d8d151a Author: David Malcolm <dmalcolm(a)redhat.com> Date: Tue Sep 6 14:03:09 2011 -0400 cpychecker: initial implementation of Py_Finalize libcpychecker/refcounts.py | 8 ++++ .../refcounts/Py_Finalize/correct/input.c | 38 ++++++++++++++++++++ .../refcounts/Py_Finalize/correct/script.py | 22 +++++++++++ .../refcounts/Py_Finalize/correct/stdout.txt | 6 +++ 4 files changed, 74 insertions(+), 0 deletions(-) --- diff --git a/libcpychecker/refcounts.py b/libcpychecker/refcounts.py index 5ee4716..997cd06 100644 --- a/libcpychecker/refcounts.py +++ b/libcpychecker/refcounts.py @@ -932,6 +932,14 @@ class MyState(State): return [t_next] ######################################################################## + # Py_Finalize() + ######################################################################## + def impl_Py_Finalize(self, stmt): + # http://docs.python.org/c-api/init.html#Py_Finalize + # For now, treat it as a no-op: + return [self.mktrans_nop(stmt, 'Py_Finalize')] + + ######################################################################## # Py_InitModule* ######################################################################## def impl_Py_InitModule4_64(self, stmt): diff --git a/tests/cpychecker/refcounts/Py_Finalize/correct/input.c b/tests/cpychecker/refcounts/Py_Finalize/correct/input.c new file mode 100644 index 0000000..7d9b037 --- /dev/null +++ b/tests/cpychecker/refcounts/Py_Finalize/correct/input.c @@ -0,0 +1,38 @@ +/* + Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> + Copyright 2011 Red Hat, Inc. + + This is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see + <http://www.gnu.org/licenses/>. +*/ + +#include <Python.h> + +/* + Test of correct call to Py_Finalize: +*/ + +void +test(void) +{ + Py_Finalize(); +} + +/* + PEP-7 +Local variables: +c-basic-offset: 4 +indent-tabs-mode: nil +End: +*/ diff --git a/tests/cpychecker/refcounts/Py_Finalize/correct/script.py b/tests/cpychecker/refcounts/Py_Finalize/correct/script.py new file mode 100644 index 0000000..fdd5ba3 --- /dev/null +++ b/tests/cpychecker/refcounts/Py_Finalize/correct/script.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> +# Copyright 2011 Red Hat, Inc. +# +# This is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see +# <http://www.gnu.org/licenses/>. + +from libcpychecker import main +main(verify_refcounting=True, + dump_traces=True, + show_traces=False) diff --git a/tests/cpychecker/refcounts/Py_Finalize/correct/stdout.txt b/tests/cpychecker/refcounts/Py_Finalize/correct/stdout.txt new file mode 100644 index 0000000..622f761 --- /dev/null +++ b/tests/cpychecker/refcounts/Py_Finalize/correct/stdout.txt @@ -0,0 +1,6 @@ +Trace 0: + Transitions: + 'calling Py_Finalize()' + 'returning' + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/Py_Finalize/correct/input.c:28

1 0

[gcc-python-plugin] cpychecker: initial implementation of PyMem_Malloc and PyMem_Free
by David Hugh Malcolm 06 Sep '11

06 Sep '11

commit 5fdceb1d7653e2a2309a5188c6164bcbad908eb4 Author: David Malcolm <dmalcolm(a)redhat.com> Date: Tue Sep 6 13:45:14 2011 -0400 cpychecker: initial implementation of PyMem_Malloc and PyMem_Free libcpychecker/refcounts.py | 61 ++++++++++++++++++++ .../PyMem_Malloc/correct/alloc-and-free/input.c | 54 +++++++++++++++++ .../PyMem_Malloc/correct/alloc-and-free/script.py | 22 +++++++ .../PyMem_Malloc/correct/alloc-and-free/stdout.txt | 45 ++++++++++++++ .../PyMem_Malloc/correct/free-NULL/input.c | 46 +++++++++++++++ .../PyMem_Malloc/correct/free-NULL/script.py | 22 +++++++ .../PyMem_Malloc/correct/free-NULL/stdout.txt | 21 +++++++ 7 files changed, 271 insertions(+), 0 deletions(-) --- diff --git a/libcpychecker/refcounts.py b/libcpychecker/refcounts.py index dda2cd4..5ee4716 100644 --- a/libcpychecker/refcounts.py +++ b/libcpychecker/refcounts.py @@ -1101,6 +1101,67 @@ class MyState(State): return [success, failure] ######################################################################## + # PyMem_* + ######################################################################## + def impl_PyMem_Free(self, stmt): + # http://docs.python.org/c-api/memory.html#PyMem_Free + fnname = 'PyMem_Free' + args = self.eval_stmt_args(stmt) + v_ptr, = args + + # FIXME: it's unsafe to call repeatedly, or on the wrong memory region + + s_new = self.copy() + s_new.loc = self.loc.next_loc() + desc = None + + # It's safe to call on NULL + if isinstance(v_ptr, ConcreteValue): + if v_ptr.is_null_ptr(): + desc = 'calling PyMem_Free on NULL' + elif isinstance(v_ptr, PointerToRegion): + # Mark the arg as being deallocated: + region = v_ptr.region + check_isinstance(region, Region) + + # Get the description of the region before trashing it: + desc = 'calling PyMem_Free on %s' % region + #t_temp = state.mktrans_assignment(stmt.lhs, + # UnknownValue(None, stmt.loc), + # 'calling tp_dealloc on %s' % region) + + # Mark the region as deallocated + # Since regions are shared with other states, we have to set this up + # for this state by assigning it with a special "DeallocatedMemory" + # value + # Clear the value for any fields within the region: + for k, v in region.fields.items(): + if v in s_new.value_for_region: + del s_new.value_for_region[v] + # Set the default value for the whole region to be "DeallocatedMemory" + s_new.region_for_var[region] = region + s_new.value_for_region[region] = DeallocatedMemory(None, stmt.loc) + + return [Transition(self, s_new, desc)] + + def impl_PyMem_Malloc(self, stmt): + # http://docs.python.org/c-api/memory.html#PyMem_Malloc + fnname = 'PyMem_Malloc' + returntype = stmt.fn.type.dereference.type + args = self.eval_stmt_args(stmt) + v_size, = args + r_nonnull = self.make_heap_region('PyMem_Malloc', stmt) + v_nonnull = PointerToRegion(returntype, stmt.loc, r_nonnull) + # FIXME: it hasn't been initialized + t_success = self.mktrans_assignment(stmt.lhs, + v_nonnull, + '%s() succeeds' % fnname) + t_failure = self.mktrans_assignment(stmt.lhs, + ConcreteValue(returntype, stmt.loc, 0), + '%s() fails' % fnname) + return [t_success, t_failure] + + ######################################################################## # PyModule_* ######################################################################## def impl_PyModule_AddIntConstant(self, stmt): diff --git a/tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/input.c b/tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/input.c new file mode 100644 index 0000000..d17ea54 --- /dev/null +++ b/tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/input.c @@ -0,0 +1,54 @@ +/* + Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> + Copyright 2011 Red Hat, Inc. + + This is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see + <http://www.gnu.org/licenses/>. +*/ + +#include <Python.h> + +/* + Test of a correct call to PyMem_Malloc (and PyMem_Free) +*/ + +extern void foo(char *buf, size_t n); + +PyObject * +test(PyObject *self, PyObject *args) +{ + char *buf = PyMem_New(char, 4096); + + if (!buf) { + return PyErr_NoMemory(); + } + + foo(buf, 4096); + + PyMem_Free(buf); + + Py_RETURN_NONE; +} +static PyMethodDef test_methods[] = { + {"test_method", test, METH_VARARGS, NULL}, + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +/* + PEP-7 +Local variables: +c-basic-offset: 4 +indent-tabs-mode: nil +End: +*/ diff --git a/tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/script.py b/tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/script.py new file mode 100644 index 0000000..fdd5ba3 --- /dev/null +++ b/tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/script.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> +# Copyright 2011 Red Hat, Inc. +# +# This is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see +# <http://www.gnu.org/licenses/>. + +from libcpychecker import main +main(verify_refcounting=True, + dump_traces=True, + show_traces=False) diff --git a/tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/stdout.txt b/tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/stdout.txt new file mode 100644 index 0000000..d4217ee --- /dev/null +++ b/tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/stdout.txt @@ -0,0 +1,45 @@ +Trace 0: + Transitions: + 'PyMem_Malloc() succeeds' + 'taking False path' + 'calling PyMem_Free on PyMem_Malloc allocated at tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/input.c:31' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/input.c', line=41), region=RegionForGlobal(gcc.VarDecl('_Py_NoneStruct'))) + str(): (struct PyObject *)&RegionForGlobal(gcc.VarDecl('_Py_NoneStruct')) from tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/input.c:41 + r->ob_refcnt: refs: 1 + N where N >= 1 + r->ob_type: None + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/input.c', line=29), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/input.c', line=29), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/input.c:30 + +Trace 1: + Transitions: + 'PyMem_Malloc() fails' + 'taking True path' + 'PyErr_NoMemory()' + 'returning' + Return value: + repr(): ConcreteValue(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/input.c', line=34), value=0) + str(): (struct PyObject *)0 from tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/input.c:34 + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/input.c', line=29), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyMem_Malloc/correct/alloc-and-free/input.c', line=29), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError')) diff --git a/tests/cpychecker/refcounts/PyMem_Malloc/correct/free-NULL/input.c b/tests/cpychecker/refcounts/PyMem_Malloc/correct/free-NULL/input.c new file mode 100644 index 0000000..e929f13 --- /dev/null +++ b/tests/cpychecker/refcounts/PyMem_Malloc/correct/free-NULL/input.c @@ -0,0 +1,46 @@ +/* + Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> + Copyright 2011 Red Hat, Inc. + + This is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see + <http://www.gnu.org/licenses/>. +*/ + +#include <Python.h> + +/* + Test of a correct call to PyMem_Free(NULL) +*/ + +extern void foo(char *buf, size_t n); + +PyObject * +test(PyObject *self, PyObject *args) +{ + PyMem_Free(NULL); + + Py_RETURN_NONE; +} +static PyMethodDef test_methods[] = { + {"test_method", test, METH_VARARGS, NULL}, + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +/* + PEP-7 +Local variables: +c-basic-offset: 4 +indent-tabs-mode: nil +End: +*/ diff --git a/tests/cpychecker/refcounts/PyMem_Malloc/correct/free-NULL/script.py b/tests/cpychecker/refcounts/PyMem_Malloc/correct/free-NULL/script.py new file mode 100644 index 0000000..fdd5ba3 --- /dev/null +++ b/tests/cpychecker/refcounts/PyMem_Malloc/correct/free-NULL/script.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> +# Copyright 2011 Red Hat, Inc. +# +# This is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see +# <http://www.gnu.org/licenses/>. + +from libcpychecker import main +main(verify_refcounting=True, + dump_traces=True, + show_traces=False) diff --git a/tests/cpychecker/refcounts/PyMem_Malloc/correct/free-NULL/stdout.txt b/tests/cpychecker/refcounts/PyMem_Malloc/correct/free-NULL/stdout.txt new file mode 100644 index 0000000..10bd3b4 --- /dev/null +++ b/tests/cpychecker/refcounts/PyMem_Malloc/correct/free-NULL/stdout.txt @@ -0,0 +1,21 @@ +Trace 0: + Transitions: + 'calling PyMem_Free on NULL' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyMem_Malloc/correct/free-NULL/input.c', line=33), region=RegionForGlobal(gcc.VarDecl('_Py_NoneStruct'))) + str(): (struct PyObject *)&RegionForGlobal(gcc.VarDecl('_Py_NoneStruct')) from tests/cpychecker/refcounts/PyMem_Malloc/correct/free-NULL/input.c:33 + r->ob_refcnt: refs: 1 + N where N >= 1 + r->ob_type: None + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyMem_Malloc/correct/free-NULL/input.c', line=29), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyMem_Malloc/correct/free-NULL/input.c', line=29), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PyMem_Malloc/correct/free-NULL/input.c:30

1 0

[gcc-python-plugin] cpychecker: implement PySys_SetObject
by David Hugh Malcolm 05 Sep '11

05 Sep '11

commit 517cda7fc22b1d058c5b150b484548304dbb9d2d Author: David Malcolm <dmalcolm(a)redhat.com> Date: Mon Sep 5 19:02:17 2011 -0400 cpychecker: implement PySys_SetObject libcpychecker/refcounts.py | 27 ++++ .../refcounts/PySys_SetObject/correct/input.c | 53 ++++++++ .../refcounts/PySys_SetObject/correct/script.py | 22 +++ .../refcounts/PySys_SetObject/correct/stdout.txt | 142 ++++++++++++++++++++ 4 files changed, 244 insertions(+), 0 deletions(-) --- diff --git a/libcpychecker/refcounts.py b/libcpychecker/refcounts.py index f1d877e..dda2cd4 100644 --- a/libcpychecker/refcounts.py +++ b/libcpychecker/refcounts.py @@ -1303,6 +1303,33 @@ class MyState(State): return [t_success, t_failure] ######################################################################## + # PySys_* + ######################################################################## + def impl_PySys_SetObject(self, stmt): + # Declated in sysmodule.h + # Defined in Python/sysmodule.c: + # int PySys_SetObject(char *name, PyObject *v) + # Docs: + # http://docs.python.org/c-api/sys.html#PySys_SetObject + # + # can be called with NULL or non-NULL, calls PyDict_SetItemString + # on non-NULL, which adds a ref on it + fnname = 'PySys_SetObject' + returntype = stmt.fn.type.dereference.type + args = self.eval_stmt_args(stmt) + v_name, v_value = args + t_success = self.mktrans_assignment(stmt.lhs, + ConcreteValue(returntype, stmt.loc, 0), + '%s() succeeds' % fnname) + if isinstance(v_value, PointerToRegion): + t_success.dest.add_external_ref(v_value, stmt.loc) + t_failure = self.mktrans_assignment(stmt.lhs, + ConcreteValue(returntype, stmt.loc, -1), + '%s() fails' % fnname) + t_failure.dest.set_exception('PyExc_MemoryError') + return [t_success, t_failure] + + ######################################################################## # PyTuple_* ######################################################################## def impl_PyTuple_New(self, stmt): diff --git a/tests/cpychecker/refcounts/PySys_SetObject/correct/input.c b/tests/cpychecker/refcounts/PySys_SetObject/correct/input.c new file mode 100644 index 0000000..0ee1ad2 --- /dev/null +++ b/tests/cpychecker/refcounts/PySys_SetObject/correct/input.c @@ -0,0 +1,53 @@ +/* + Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> + Copyright 2011 Red Hat, Inc. + + This is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see + <http://www.gnu.org/licenses/>. +*/ + +#include <Python.h> + +/* + Test of correct reference-handling in a call to PySys_SetObject + with a non-NULL argument +*/ + +PyObject * +test(PyObject *self, PyObject *args) +{ + PyObject *str; + str = PyString_FromString("hello world"); + if (!str) { + return NULL; + } + /* we own a ref on the string */ + /* if successful, this adds a ref on the string: */ + PySys_SetObject("greeting", str); + /* get rid of our ref on the string: */ + Py_DECREF(str); + Py_RETURN_NONE; +} +static PyMethodDef test_methods[] = { + {"test_method", test, METH_VARARGS, NULL}, + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +/* + PEP-7 +Local variables: +c-basic-offset: 4 +indent-tabs-mode: nil +End: +*/ diff --git a/tests/cpychecker/refcounts/PySys_SetObject/correct/script.py b/tests/cpychecker/refcounts/PySys_SetObject/correct/script.py new file mode 100644 index 0000000..fdd5ba3 --- /dev/null +++ b/tests/cpychecker/refcounts/PySys_SetObject/correct/script.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> +# Copyright 2011 Red Hat, Inc. +# +# This is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see +# <http://www.gnu.org/licenses/>. + +from libcpychecker import main +main(verify_refcounting=True, + dump_traces=True, + show_traces=False) diff --git a/tests/cpychecker/refcounts/PySys_SetObject/correct/stdout.txt b/tests/cpychecker/refcounts/PySys_SetObject/correct/stdout.txt new file mode 100644 index 0000000..ba0eb88 --- /dev/null +++ b/tests/cpychecker/refcounts/PySys_SetObject/correct/stdout.txt @@ -0,0 +1,142 @@ +Trace 0: + Transitions: + 'PyString_FromString() succeeds' + 'taking False path' + 'PySys_SetObject() succeeds' + 'taking True path' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=40), region=RegionForGlobal(gcc.VarDecl('_Py_NoneStruct'))) + str(): (struct PyObject *)&RegionForGlobal(gcc.VarDecl('_Py_NoneStruct')) from tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:40 + r->ob_refcnt: refs: 1 + N where N >= 1 + r->ob_type: None + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=28), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=28), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + PyStringObject allocated at tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:31: + repr(): RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=31)) + str(): PyStringObject allocated at tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:31 + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=31), region=RegionForGlobal(gcc.VarDecl('PyString_Type'))) + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:29 + +Trace 1: + Transitions: + 'PyString_FromString() succeeds' + 'taking False path' + 'PySys_SetObject() succeeds' + 'taking False path' + 'calling tp_dealloc on PyStringObject allocated at tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:31' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=40), region=RegionForGlobal(gcc.VarDecl('_Py_NoneStruct'))) + str(): (struct PyObject *)&RegionForGlobal(gcc.VarDecl('_Py_NoneStruct')) from tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:40 + r->ob_refcnt: refs: 1 + N where N >= 1 + r->ob_type: None + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=28), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=28), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + PyStringObject allocated at tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:31: + repr(): RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=31)) + str(): PyStringObject allocated at tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:31 + r->ob_refcnt: None + r->ob_type: None + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:29 + +Trace 2: + Transitions: + 'PyString_FromString() succeeds' + 'taking False path' + 'PySys_SetObject() fails' + 'taking True path' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=40), region=RegionForGlobal(gcc.VarDecl('_Py_NoneStruct'))) + str(): (struct PyObject *)&RegionForGlobal(gcc.VarDecl('_Py_NoneStruct')) from tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:40 + r->ob_refcnt: refs: 1 + N where N >= 1 + r->ob_type: None + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=28), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=28), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + PyStringObject allocated at tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:31: + repr(): RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=31)) + str(): PyStringObject allocated at tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:31 + r->ob_refcnt: refs: 0 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=31), region=RegionForGlobal(gcc.VarDecl('PyString_Type'))) + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError')) + +Trace 3: + Transitions: + 'PyString_FromString() succeeds' + 'taking False path' + 'PySys_SetObject() fails' + 'taking False path' + 'calling tp_dealloc on PyStringObject allocated at tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:31' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=40), region=RegionForGlobal(gcc.VarDecl('_Py_NoneStruct'))) + str(): (struct PyObject *)&RegionForGlobal(gcc.VarDecl('_Py_NoneStruct')) from tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:40 + r->ob_refcnt: refs: 1 + N where N >= 1 + r->ob_type: None + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=28), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=28), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + PyStringObject allocated at tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:31: + repr(): RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=31)) + str(): PyStringObject allocated at tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:31 + r->ob_refcnt: None + r->ob_type: None + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError')) + +Trace 4: + Transitions: + 'PyString_FromString() fails' + 'taking True path' + 'returning' + Return value: + repr(): ConcreteValue(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=33), value=0) + str(): (struct PyObject *)0 from tests/cpychecker/refcounts/PySys_SetObject/correct/input.c:33 + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=28), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PySys_SetObject/correct/input.c', line=28), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError'))

1 0

[gcc-python-plugin] cpychecker: implement PyString_AsString
by David Hugh Malcolm 03 Sep '11

03 Sep '11

commit 7922e98d5765221861bef8100f6b4dd69756c41b Author: David Malcolm <dmalcolm(a)redhat.com> Date: Sat Sep 3 09:35:29 2011 -0400 cpychecker: implement PyString_AsString libcpychecker/refcounts.py | 57 ++++++++ .../refcounts/PyString_AsString/correct/input.c | 52 +++++++ .../refcounts/PyString_AsString/correct/script.py | 22 +++ .../refcounts/PyString_AsString/correct/stdout.txt | 142 ++++++++++++++++++++ .../refcounts/PyString_AsString/incorrect/input.c | 54 ++++++++ .../PyString_AsString/incorrect/script.py | 22 +++ .../PyString_AsString/incorrect/stderr.txt | 4 + .../PyString_AsString/incorrect/stdout.txt | 135 +++++++++++++++++++ .../refcounts/PyString_AsString/unknown/input.c | 48 +++++++ .../refcounts/PyString_AsString/unknown/script.py | 22 +++ .../refcounts/PyString_AsString/unknown/stdout.txt | 87 ++++++++++++ 11 files changed, 645 insertions(+), 0 deletions(-) --- diff --git a/libcpychecker/refcounts.py b/libcpychecker/refcounts.py index 5d15477..f1d877e 100644 --- a/libcpychecker/refcounts.py +++ b/libcpychecker/refcounts.py @@ -565,6 +565,21 @@ class MyState(State): return [self.eval_rvalue(arg, stmt.loc) for arg in stmt.args] + def object_ptr_has_global_ob_type(self, v_object_ptr, vardecl_name): + """ + Boolean: do we know that the given PyObject* has an ob_type matching + the given global PyTypeObject (e.g. "PyString_Type") + """ + check_isinstance(v_object_ptr, AbstractValue) + check_isinstance(vardecl_name, str) + if isinstance(v_object_ptr, PointerToRegion): + v_ob_type = self.get_value_of_field_by_region(v_object_ptr.region, + 'ob_type') + if isinstance(v_ob_type, PointerToRegion): + if isinstance(v_ob_type.region, RegionForGlobal): + if v_ob_type.region.vardecl.name == vardecl_name: + return True + # Treat calls to various function prefixed with __cpychecker as special, # to help with debugging, and when writing selftests: @@ -1195,6 +1210,48 @@ class MyState(State): ######################################################################## # PyString_* ######################################################################## + def impl_PyString_AsString(self, stmt): + # Declared in stringobject.h as: + # PyAPI_FUNC(char *) PyString_AsString(PyObject *); + # Implemented in Objects/stringobject.c + # + # http://docs.python.org/c-api/string.html#PyString_AsString + # + # With PyStringObject and their subclasses, it returns + # ((PyStringObject *)op) -> ob_sval + # With other classes, this call can fail + + v_op, = self.eval_stmt_args(stmt) + + # It will segfault if called with NULL, since it uses PyString_Check, + # which reads through the object's ob_type: + self.raise_any_null_ptr_func_arg(stmt, 0, v_op) + + returntype = stmt.fn.type.dereference.type + + if self.object_ptr_has_global_ob_type(v_op, 'PyString_Type'): + # We know it's a PyStringObject; the call will succeed: + # FIXME: cast: + r_ob_sval = self.make_field_region(v_op.region, 'ob_sval') + v_result = PointerToRegion(returntype, stmt.loc, r_ob_sval) + t_success = self.mktrans_assignment(stmt.lhs, + v_result, + 'PyString_AsString() returns ob_sval') + return [t_success] + + # We don't know if it's a PyStringObject (or subclass); the call could + # fail: + r_nonnull = self.make_heap_region('buffer from PyString_AsString()', stmt) + v_success = PointerToRegion(returntype, stmt.loc, r_nonnull) + t_success = self.mktrans_assignment(stmt.lhs, + v_success, + 'PyString_AsString() succeeds') + t_failure = self.mktrans_assignment(stmt.lhs, + ConcreteValue(returntype, stmt.loc, 0), + 'PyString_AsString() fails') + t_failure.dest.set_exception('PyExc_MemoryError') + return [t_success, t_failure] + def impl_PyString_FromFormat(self, stmt): # Declared in stringobject.h as: # PyAPI_FUNC(PyObject *) PyString_FromFormat(const char*, ...) diff --git a/tests/cpychecker/refcounts/PyString_AsString/correct/input.c b/tests/cpychecker/refcounts/PyString_AsString/correct/input.c new file mode 100644 index 0000000..d8d7a98 --- /dev/null +++ b/tests/cpychecker/refcounts/PyString_AsString/correct/input.c @@ -0,0 +1,52 @@ +/* + Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> + Copyright 2011 Red Hat, Inc. + + This is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see + <http://www.gnu.org/licenses/>. +*/ + +#include <Python.h> + +/* + Test of correct call to PyString_AsString +*/ +PyObject * +test(PyObject *self, PyObject *args) +{ + PyObject *repr_args = NULL; + PyObject *result = NULL; + + repr_args = PyObject_Repr(args); + if (!repr_args) { + return NULL; + } + + result = PyString_FromFormat("test(args=%s)", + PyString_AsString(repr_args)); + Py_DECREF(repr_args); + return result; +} +static PyMethodDef test_methods[] = { + {"test_method", test, METH_VARARGS, NULL}, + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +/* + PEP-7 +Local variables: +c-basic-offset: 4 +indent-tabs-mode: nil +End: +*/ diff --git a/tests/cpychecker/refcounts/PyString_AsString/correct/script.py b/tests/cpychecker/refcounts/PyString_AsString/correct/script.py new file mode 100644 index 0000000..fdd5ba3 --- /dev/null +++ b/tests/cpychecker/refcounts/PyString_AsString/correct/script.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> +# Copyright 2011 Red Hat, Inc. +# +# This is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see +# <http://www.gnu.org/licenses/>. + +from libcpychecker import main +main(verify_refcounting=True, + dump_traces=True, + show_traces=False) diff --git a/tests/cpychecker/refcounts/PyString_AsString/correct/stdout.txt b/tests/cpychecker/refcounts/PyString_AsString/correct/stdout.txt new file mode 100644 index 0000000..d6008b8 --- /dev/null +++ b/tests/cpychecker/refcounts/PyString_AsString/correct/stdout.txt @@ -0,0 +1,142 @@ +Trace 0: + Transitions: + 'PyObject_Repr() succeeds' + 'taking False path' + 'PyString_AsString() returns ob_sval' + 'PyString_FromFormat() succeeds' + 'taking True path' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=36), region=RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=36))) + str(): (struct PyObject *)&RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=36)) from tests/cpychecker/refcounts/PyString_AsString/correct/input.c:36 + r->ob_refcnt: refs: 1 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=36), region=RegionForGlobal(gcc.VarDecl('PyString_Type'))) + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/correct/input.c:31: + repr(): RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=31)) + str(): PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/correct/input.c:31 + r->ob_refcnt: refs: 0 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=31), region=RegionForGlobal(gcc.VarDecl('PyString_Type'))) + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PyString_AsString/correct/input.c:27 + +Trace 1: + Transitions: + 'PyObject_Repr() succeeds' + 'taking False path' + 'PyString_AsString() returns ob_sval' + 'PyString_FromFormat() succeeds' + 'taking False path' + 'calling tp_dealloc on PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/correct/input.c:31' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=36), region=RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=36))) + str(): (struct PyObject *)&RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=36)) from tests/cpychecker/refcounts/PyString_AsString/correct/input.c:36 + r->ob_refcnt: refs: 1 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=36), region=RegionForGlobal(gcc.VarDecl('PyString_Type'))) + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/correct/input.c:31: + repr(): RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=31)) + str(): PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/correct/input.c:31 + r->ob_refcnt: None + r->ob_type: None + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PyString_AsString/correct/input.c:27 + +Trace 2: + Transitions: + 'PyObject_Repr() succeeds' + 'taking False path' + 'PyString_AsString() returns ob_sval' + 'PyString_FromFormat() fails' + 'taking True path' + 'returning' + Return value: + repr(): ConcreteValue(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=36), value=0) + str(): (struct PyObject *)0 from tests/cpychecker/refcounts/PyString_AsString/correct/input.c:36 + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/correct/input.c:31: + repr(): RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=31)) + str(): PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/correct/input.c:31 + r->ob_refcnt: refs: 0 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=31), region=RegionForGlobal(gcc.VarDecl('PyString_Type'))) + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError')) + +Trace 3: + Transitions: + 'PyObject_Repr() succeeds' + 'taking False path' + 'PyString_AsString() returns ob_sval' + 'PyString_FromFormat() fails' + 'taking False path' + 'calling tp_dealloc on PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/correct/input.c:31' + 'returning' + Return value: + repr(): ConcreteValue(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=36), value=0) + str(): (struct PyObject *)0 from tests/cpychecker/refcounts/PyString_AsString/correct/input.c:36 + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/correct/input.c:31: + repr(): RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=31)) + str(): PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/correct/input.c:31 + r->ob_refcnt: None + r->ob_type: None + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError')) + +Trace 4: + Transitions: + 'PyObject_Repr() fails' + 'taking True path' + 'returning' + Return value: + repr(): ConcreteValue(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=33), value=0) + str(): (struct PyObject *)0 from tests/cpychecker/refcounts/PyString_AsString/correct/input.c:33 + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/correct/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError')) diff --git a/tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c b/tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c new file mode 100644 index 0000000..2b5a77b --- /dev/null +++ b/tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c @@ -0,0 +1,54 @@ +/* + Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> + Copyright 2011 Red Hat, Inc. + + This is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see + <http://www.gnu.org/licenses/>. +*/ + +#include <Python.h> + +/* + Test of incorrect call to PyString_AsString +*/ +PyObject * +test(PyObject *self, PyObject *args) +{ + PyObject *repr_args = NULL; + PyObject *result = NULL; + + repr_args = PyObject_Repr(args); + /* + This code fails to check that the call to PyObject_Repr succeeded; + the checker ought to detect that a NULL ptr deref can happen inside + PyString_AsString: + */ + + result = PyString_FromFormat("test(args=%s)", + PyString_AsString(repr_args)); + Py_DECREF(repr_args); + return result; +} +static PyMethodDef test_methods[] = { + {"test_method", test, METH_VARARGS, NULL}, + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +/* + PEP-7 +Local variables: +c-basic-offset: 4 +indent-tabs-mode: nil +End: +*/ diff --git a/tests/cpychecker/refcounts/PyString_AsString/incorrect/script.py b/tests/cpychecker/refcounts/PyString_AsString/incorrect/script.py new file mode 100644 index 0000000..fdd5ba3 --- /dev/null +++ b/tests/cpychecker/refcounts/PyString_AsString/incorrect/script.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> +# Copyright 2011 Red Hat, Inc. +# +# This is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see +# <http://www.gnu.org/licenses/>. + +from libcpychecker import main +main(verify_refcounting=True, + dump_traces=True, + show_traces=False) diff --git a/tests/cpychecker/refcounts/PyString_AsString/incorrect/stderr.txt b/tests/cpychecker/refcounts/PyString_AsString/incorrect/stderr.txt new file mode 100644 index 0000000..d3d42d4 --- /dev/null +++ b/tests/cpychecker/refcounts/PyString_AsString/incorrect/stderr.txt @@ -0,0 +1,4 @@ +tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c: In function 'test': +tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:38:33: error: calling PyString_AsString with NULL (gcc.VarDecl('repr_args')) as argument 0 at tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:38 +tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:31:15: note: when PyObject_Repr() fails at: repr_args = PyObject_Repr(args); +tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:27:1: note: graphical error report for function 'test' written out to 'tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c.test-refcount-errors.html' diff --git a/tests/cpychecker/refcounts/PyString_AsString/incorrect/stdout.txt b/tests/cpychecker/refcounts/PyString_AsString/incorrect/stdout.txt new file mode 100644 index 0000000..47802a6 --- /dev/null +++ b/tests/cpychecker/refcounts/PyString_AsString/incorrect/stdout.txt @@ -0,0 +1,135 @@ +Trace 0: + Transitions: + 'PyObject_Repr() succeeds' + 'PyString_AsString() returns ob_sval' + 'PyString_FromFormat() succeeds' + 'taking True path' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=38), region=RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=38))) + str(): (struct PyObject *)&RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=38)) from tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:38 + r->ob_refcnt: refs: 1 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=38), region=RegionForGlobal(gcc.VarDecl('PyString_Type'))) + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:31: + repr(): RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=31)) + str(): PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:31 + r->ob_refcnt: refs: 0 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=31), region=RegionForGlobal(gcc.VarDecl('PyString_Type'))) + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:27 + +Trace 1: + Transitions: + 'PyObject_Repr() succeeds' + 'PyString_AsString() returns ob_sval' + 'PyString_FromFormat() succeeds' + 'taking False path' + 'calling tp_dealloc on PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:31' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=38), region=RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=38))) + str(): (struct PyObject *)&RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=38)) from tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:38 + r->ob_refcnt: refs: 1 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=38), region=RegionForGlobal(gcc.VarDecl('PyString_Type'))) + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:31: + repr(): RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=31)) + str(): PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:31 + r->ob_refcnt: None + r->ob_type: None + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:27 + +Trace 2: + Transitions: + 'PyObject_Repr() succeeds' + 'PyString_AsString() returns ob_sval' + 'PyString_FromFormat() fails' + 'taking True path' + 'returning' + Return value: + repr(): ConcreteValue(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=38), value=0) + str(): (struct PyObject *)0 from tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:38 + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:31: + repr(): RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=31)) + str(): PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:31 + r->ob_refcnt: refs: 0 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=31), region=RegionForGlobal(gcc.VarDecl('PyString_Type'))) + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError')) + +Trace 3: + Transitions: + 'PyObject_Repr() succeeds' + 'PyString_AsString() returns ob_sval' + 'PyString_FromFormat() fails' + 'taking False path' + 'calling tp_dealloc on PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:31' + 'returning' + Return value: + repr(): ConcreteValue(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=38), value=0) + str(): (struct PyObject *)0 from tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:38 + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:31: + repr(): RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=31)) + str(): PyStringObject allocated at tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:31 + r->ob_refcnt: None + r->ob_type: None + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError')) + +Trace 4: + Transitions: + 'PyObject_Repr() fails' + error: NullPtrArgument() + error: calling PyString_AsString with NULL (gcc.VarDecl('repr_args')) as argument 0 at tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c:38 + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/incorrect/input.c', line=26), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError')) diff --git a/tests/cpychecker/refcounts/PyString_AsString/unknown/input.c b/tests/cpychecker/refcounts/PyString_AsString/unknown/input.c new file mode 100644 index 0000000..02b4d0b --- /dev/null +++ b/tests/cpychecker/refcounts/PyString_AsString/unknown/input.c @@ -0,0 +1,48 @@ +/* + Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> + Copyright 2011 Red Hat, Inc. + + This is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see + <http://www.gnu.org/licenses/>. +*/ + +#include <Python.h> + +/* + Test of a call to PyString_AsString where we can't know whether or not + it's a PyStringObject +*/ +PyObject * +test(PyObject *self, PyObject *args) +{ + PyObject *result = NULL; + + /* (ultimately we ought to detect when PyString_FromFormat is passed + a NULL for a %s format code) */ + result = PyString_FromFormat("test(args=%s)", + PyString_AsString(args)); + return result; +} +static PyMethodDef test_methods[] = { + {"test_method", test, METH_VARARGS, NULL}, + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +/* + PEP-7 +Local variables: +c-basic-offset: 4 +indent-tabs-mode: nil +End: +*/ diff --git a/tests/cpychecker/refcounts/PyString_AsString/unknown/script.py b/tests/cpychecker/refcounts/PyString_AsString/unknown/script.py new file mode 100644 index 0000000..fdd5ba3 --- /dev/null +++ b/tests/cpychecker/refcounts/PyString_AsString/unknown/script.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> +# Copyright 2011 Red Hat, Inc. +# +# This is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see +# <http://www.gnu.org/licenses/>. + +from libcpychecker import main +main(verify_refcounting=True, + dump_traces=True, + show_traces=False) diff --git a/tests/cpychecker/refcounts/PyString_AsString/unknown/stdout.txt b/tests/cpychecker/refcounts/PyString_AsString/unknown/stdout.txt new file mode 100644 index 0000000..a53fc53 --- /dev/null +++ b/tests/cpychecker/refcounts/PyString_AsString/unknown/stdout.txt @@ -0,0 +1,87 @@ +Trace 0: + Transitions: + 'PyString_AsString() succeeds' + 'PyString_FromFormat() succeeds' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=33), region=RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=33))) + str(): (struct PyObject *)&RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=33)) from tests/cpychecker/refcounts/PyString_AsString/unknown/input.c:33 + r->ob_refcnt: refs: 1 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=33), region=RegionForGlobal(gcc.VarDecl('PyString_Type'))) + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=27), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=27), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PyString_AsString/unknown/input.c:28 + +Trace 1: + Transitions: + 'PyString_AsString() succeeds' + 'PyString_FromFormat() fails' + 'returning' + Return value: + repr(): ConcreteValue(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=33), value=0) + str(): (struct PyObject *)0 from tests/cpychecker/refcounts/PyString_AsString/unknown/input.c:33 + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=27), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=27), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError')) + +Trace 2: + Transitions: + 'PyString_AsString() fails' + 'PyString_FromFormat() succeeds' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=33), region=RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=33))) + str(): (struct PyObject *)&RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=33)) from tests/cpychecker/refcounts/PyString_AsString/unknown/input.c:33 + r->ob_refcnt: refs: 1 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=33), region=RegionForGlobal(gcc.VarDecl('PyString_Type'))) + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=27), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=27), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError')) + +Trace 3: + Transitions: + 'PyString_AsString() fails' + 'PyString_FromFormat() fails' + 'returning' + Return value: + repr(): ConcreteValue(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=33), value=0) + str(): (struct PyObject *)0 from tests/cpychecker/refcounts/PyString_AsString/unknown/input.c:33 + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=27), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyString_AsString/unknown/input.c', line=27), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError'))

1 0

[gcc-python-plugin] cpychecker: implement PyStructSequence_New
by David Hugh Malcolm 02 Sep '11

02 Sep '11

commit a5398f7e9f77a3beaecfe8b4a9c926f3d467b5d3 Author: David Malcolm <dmalcolm(a)redhat.com> Date: Fri Sep 2 18:21:45 2011 -0400 cpychecker: implement PyStructSequence_New libcpychecker/refcounts.py | 30 ++++++++ .../refcounts/PyStructSequence/correct/input.c | 75 ++++++++++++++++++++ .../refcounts/PyStructSequence/correct/script.py | 22 ++++++ .../refcounts/PyStructSequence/correct/stdout.txt | 55 ++++++++++++++ 4 files changed, 182 insertions(+), 0 deletions(-) --- diff --git a/libcpychecker/refcounts.py b/libcpychecker/refcounts.py index bba1644..5d15477 100644 --- a/libcpychecker/refcounts.py +++ b/libcpychecker/refcounts.py @@ -1216,6 +1216,36 @@ class MyState(State): return [t_success, t_failure] ######################################################################## + # PyStructSequence_* + ######################################################################## + def impl_PyStructSequence_New(self, stmt): + # Declared in structseq.h as: + # PyAPI_FUNC(PyObject *) PyStructSequence_New(PyTypeObject* type); + # + # Implemented in Objects/structseq.c + + # From our perspective, this is very similar to _PyObject_New + assert isinstance(stmt, gcc.GimpleCall) + assert isinstance(stmt.fn.operand, gcc.FunctionDecl) + + tp_rvalue = self.eval_rvalue(stmt.args[0], stmt.loc) + + # Success case: allocation and assignment: + s_success, nonnull = self.mkstate_new_ref(stmt, 'PyStructSequence_New') + # ...and set up ob_type on the result object: + ob_type = s_success.make_field_region(nonnull, 'ob_type') + s_success.value_for_region[ob_type] = tp_rvalue + t_success = Transition(self, + s_success, + 'PyStructSequence_New() succeeds') + # Failure case: + t_failure = self.mktrans_assignment(stmt.lhs, + ConcreteValue(stmt.lhs.type, stmt.loc, 0), + 'PyStructSequence_New() fails') + t_failure.dest.set_exception('PyExc_MemoryError') + return [t_success, t_failure] + + ######################################################################## # PyTuple_* ######################################################################## def impl_PyTuple_New(self, stmt): diff --git a/tests/cpychecker/refcounts/PyStructSequence/correct/input.c b/tests/cpychecker/refcounts/PyStructSequence/correct/input.c new file mode 100644 index 0000000..7ed7778 --- /dev/null +++ b/tests/cpychecker/refcounts/PyStructSequence/correct/input.c @@ -0,0 +1,75 @@ +/* + Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> + Copyright 2011 Red Hat, Inc. + + This is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see + <http://www.gnu.org/licenses/>. +*/ + +/* + Test of correct reference-handling in usage of the PyStructSequence API +*/ + +#include <Python.h> +#include <structseq.h> /* not pulled in by Python.h */ + +static struct PyStructSequence_Field coord_fields[] = { + {"x", NULL}, + {"y", NULL}, + {0} +}; + +static struct PyStructSequence_Desc coord_desc = { + "Coord", /* name */ + NULL, /* doc */ + coord_fields, + 2 +}; + +PyTypeObject CoordType; + +PyObject * +test(PyObject *self, PyObject *args) +{ + /* + FWIW, this assumes that we called: + PyStructSequence_InitType(&CoordType, &coord_desc); + when initializing the module: + */ + PyObject *obj = PyStructSequence_New(&CoordType); + if (!obj) { + return NULL; + } + + /* + These PyInt_ calls can't fail; the SET_ITEM macros steal the new ref + they give us, so this is correct: + */ + PyStructSequence_SET_ITEM(obj, 0, PyInt_FromLong(0)); + PyStructSequence_SET_ITEM(obj, 1, PyInt_FromLong(0)); + return obj; +} + +static PyMethodDef test_methods[] = { + {"test_method", test, METH_VARARGS, NULL}, + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +/* + PEP-7 +Local variables: +c-basic-offset: 4 +indent-tabs-mode: nil +End: +*/ diff --git a/tests/cpychecker/refcounts/PyStructSequence/correct/script.py b/tests/cpychecker/refcounts/PyStructSequence/correct/script.py new file mode 100644 index 0000000..fdd5ba3 --- /dev/null +++ b/tests/cpychecker/refcounts/PyStructSequence/correct/script.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> +# Copyright 2011 Red Hat, Inc. +# +# This is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see +# <http://www.gnu.org/licenses/>. + +from libcpychecker import main +main(verify_refcounting=True, + dump_traces=True, + show_traces=False) diff --git a/tests/cpychecker/refcounts/PyStructSequence/correct/stdout.txt b/tests/cpychecker/refcounts/PyStructSequence/correct/stdout.txt new file mode 100644 index 0000000..cc91edf --- /dev/null +++ b/tests/cpychecker/refcounts/PyStructSequence/correct/stdout.txt @@ -0,0 +1,55 @@ +Trace 0: + Transitions: + 'PyStructSequence_New() succeeds' + 'taking False path' + 'PyInt_FromLong() succeeds' + 'PyInt_FromLong() succeeds' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyStructSequence/correct/input.c', line=50), region=RegionOnHeap('PyStructSequence_New', gcc.Location(file='tests/cpychecker/refcounts/PyStructSequence/correct/input.c', line=50))) + str(): (struct PyObject *)&RegionOnHeap('PyStructSequence_New', gcc.Location(file='tests/cpychecker/refcounts/PyStructSequence/correct/input.c', line=50)) from tests/cpychecker/refcounts/PyStructSequence/correct/input.c:50 + r->ob_refcnt: refs: 1 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyStructSequence/correct/input.c', line=50), region=RegionForGlobal(gcc.VarDecl('CoordType'))) + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyStructSequence/correct/input.c', line=43), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyStructSequence/correct/input.c', line=43), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + PyIntObject allocated at tests/cpychecker/refcounts/PyStructSequence/correct/input.c:59: + repr(): RegionOnHeap('PyIntObject', gcc.Location(file='tests/cpychecker/refcounts/PyStructSequence/correct/input.c', line=59)) + str(): PyIntObject allocated at tests/cpychecker/refcounts/PyStructSequence/correct/input.c:59 + r->ob_refcnt: refs: 1 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyStructSequence/correct/input.c', line=59), region=RegionForGlobal(gcc.VarDecl('PyInt_Type'))) + PyIntObject allocated at tests/cpychecker/refcounts/PyStructSequence/correct/input.c:60: + repr(): RegionOnHeap('PyIntObject', gcc.Location(file='tests/cpychecker/refcounts/PyStructSequence/correct/input.c', line=60)) + str(): PyIntObject allocated at tests/cpychecker/refcounts/PyStructSequence/correct/input.c:60 + r->ob_refcnt: refs: 1 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyStructSequence/correct/input.c', line=60), region=RegionForGlobal(gcc.VarDecl('PyInt_Type'))) + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PyStructSequence/correct/input.c:44 + +Trace 1: + Transitions: + 'PyStructSequence_New() fails' + 'taking True path' + 'returning' + Return value: + repr(): ConcreteValue(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyStructSequence/correct/input.c', line=52), value=0) + str(): (struct PyObject *)0 from tests/cpychecker/refcounts/PyStructSequence/correct/input.c:52 + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyStructSequence/correct/input.c', line=43), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyStructSequence/correct/input.c', line=43), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError'))

1 0

[gcc-python-plugin] cpychecker: update selftest to reflect better implementation of PyString_FromFormat
by David Hugh Malcolm 02 Sep '11

02 Sep '11

commit 6232685704b161235b6a80f3beea236b069445cb Author: David Malcolm <dmalcolm(a)redhat.com> Date: Fri Sep 2 17:59:44 2011 -0400 cpychecker: update selftest to reflect better implementation of PyString_FromFormat .../refcounts/subclass/handling/stdout.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- diff --git a/tests/cpychecker/refcounts/subclass/handling/stdout.txt b/tests/cpychecker/refcounts/subclass/handling/stdout.txt index 8fb97fb..43112a6 100644 --- a/tests/cpychecker/refcounts/subclass/handling/stdout.txt +++ b/tests/cpychecker/refcounts/subclass/handling/stdout.txt @@ -3,10 +3,10 @@ Trace 0: 'PyString_FromFormat() succeeds' 'returning' Return value: - repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/subclass/handling/input.c', line=39), region=RegionOnHeap('new ref from (unknown) PyString_FromFormat', gcc.Location(file='tests/cpychecker/refcounts/subclass/handling/input.c', line=39))) - str(): (struct PyObject *)&RegionOnHeap('new ref from (unknown) PyString_FromFormat', gcc.Location(file='tests/cpychecker/refcounts/subclass/handling/input.c', line=39)) from tests/cpychecker/refcounts/subclass/handling/input.c:39 + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/subclass/handling/input.c', line=39), region=RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/subclass/handling/input.c', line=39))) + str(): (struct PyObject *)&RegionOnHeap('PyStringObject', gcc.Location(file='tests/cpychecker/refcounts/subclass/handling/input.c', line=39)) from tests/cpychecker/refcounts/subclass/handling/input.c:39 r->ob_refcnt: refs: 1 + N where N >= 0 - r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/subclass/handling/input.c', line=39), region=Region('PyTypeObject for new ref from (unknown) PyString_FromFormat')) + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/subclass/handling/input.c', line=39), region=RegionForGlobal(gcc.VarDecl('PyString_Type'))) Region("region-for-arg-gcc.ParmDecl('self')"): repr(): Region("region-for-arg-gcc.ParmDecl('self')") str(): Region("region-for-arg-gcc.ParmDecl('self')")

1 0

[gcc-python-plugin] cpychecker: implement PyType_IsSubtype
by David Hugh Malcolm 02 Sep '11

02 Sep '11

commit c45370a9afa9f284af09163a62e6630a1e8525fe Author: David Malcolm <dmalcolm(a)redhat.com> Date: Fri Sep 2 17:30:38 2011 -0400 cpychecker: implement PyType_IsSubtype libcpychecker/refcounts.py | 9 ++++ .../refcounts/PyType_IsSubtype/correct/input.c | 48 ++++++++++++++++++++ .../refcounts/PyType_IsSubtype/correct/script.py | 22 +++++++++ .../refcounts/PyType_IsSubtype/correct/stdout.txt | 47 +++++++++++++++++++ 4 files changed, 126 insertions(+), 0 deletions(-) --- diff --git a/libcpychecker/refcounts.py b/libcpychecker/refcounts.py index 0a8498b..bba1644 100644 --- a/libcpychecker/refcounts.py +++ b/libcpychecker/refcounts.py @@ -1226,6 +1226,15 @@ class MyState(State): ######################################################################## # PyType_* ######################################################################## + def impl_PyType_IsSubtype(self, stmt): + # http://docs.python.org/dev/c-api/type.html#PyType_IsSubtype + args = self.eval_stmt_args(stmt) + v_a, v_b = args + returntype = stmt.fn.type.dereference.type + return [self.mktrans_assignment(stmt.lhs, + UnknownValue(returntype, stmt.loc), + None)] + def impl_PyType_Ready(self, stmt): # http://docs.python.org/dev/c-api/type.html#PyType_Ready args = self.eval_stmt_args(stmt) diff --git a/tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c b/tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c new file mode 100644 index 0000000..0e21964 --- /dev/null +++ b/tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c @@ -0,0 +1,48 @@ +/* + Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> + Copyright 2011 Red Hat, Inc. + + This is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see + <http://www.gnu.org/licenses/>. +*/ + +#include <Python.h> + +/* + Test of correct reference-handling in a call to PyType_IsSubtype +*/ + +extern PyTypeObject some_type; + +PyObject * +test(PyObject *self, PyObject *args) +{ + /* + PyObject_TypeCheck is a macro, which can call PyType_IsSubtype if + the pointers aren't equal + */ + return PyBool_FromLong(PyObject_TypeCheck(self, &some_type)); +} +static PyMethodDef test_methods[] = { + {"test_method", test, METH_VARARGS, NULL}, + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +/* + PEP-7 +Local variables: +c-basic-offset: 4 +indent-tabs-mode: nil +End: +*/ diff --git a/tests/cpychecker/refcounts/PyType_IsSubtype/correct/script.py b/tests/cpychecker/refcounts/PyType_IsSubtype/correct/script.py new file mode 100644 index 0000000..fdd5ba3 --- /dev/null +++ b/tests/cpychecker/refcounts/PyType_IsSubtype/correct/script.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2011 David Malcolm <dmalcolm(a)redhat.com> +# Copyright 2011 Red Hat, Inc. +# +# This is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see +# <http://www.gnu.org/licenses/>. + +from libcpychecker import main +main(verify_refcounting=True, + dump_traces=True, + show_traces=False) diff --git a/tests/cpychecker/refcounts/PyType_IsSubtype/correct/stdout.txt b/tests/cpychecker/refcounts/PyType_IsSubtype/correct/stdout.txt new file mode 100644 index 0000000..03234d3 --- /dev/null +++ b/tests/cpychecker/refcounts/PyType_IsSubtype/correct/stdout.txt @@ -0,0 +1,47 @@ +Trace 0: + Transitions: + 'taking False path' + 'taking True path' + 'PyBool_FromLong() returns' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35), region=RegionOnHeap('PyBool_FromLong', gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35))) + str(): (struct PyObject *)&RegionOnHeap('PyBool_FromLong', gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35)) from tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c:35 + r->ob_refcnt: refs: 1 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35), region=Region('PyTypeObject for PyBool_FromLong')) + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=29), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=29), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c:30 + +Trace 1: + Transitions: + 'taking False path' + 'taking False path' + 'PyBool_FromLong() returns' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35), region=RegionOnHeap('PyBool_FromLong', gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35))) + str(): (struct PyObject *)&RegionOnHeap('PyBool_FromLong', gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35)) from tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c:35 + r->ob_refcnt: refs: 1 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35), region=Region('PyTypeObject for PyBool_FromLong')) + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=29), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=29), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c:30

1 0

[gcc-python-plugin] cpychecker: implement PyType_Ready
by David Hugh Malcolm 02 Sep '11

02 Sep '11

commit d1e7998802d5bc88b0cc4e12630e11e9a4f0be43 Author: David Malcolm <dmalcolm(a)redhat.com> Date: Fri Sep 2 17:25:24 2011 -0400 cpychecker: implement PyType_Ready libcpychecker/refcounts.py | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) --- diff --git a/libcpychecker/refcounts.py b/libcpychecker/refcounts.py index 2e561ad..0a8498b 100644 --- a/libcpychecker/refcounts.py +++ b/libcpychecker/refcounts.py @@ -1224,6 +1224,21 @@ class MyState(State): return [t_success, t_failure] ######################################################################## + # PyType_* + ######################################################################## + def impl_PyType_Ready(self, stmt): + # http://docs.python.org/dev/c-api/type.html#PyType_Ready + args = self.eval_stmt_args(stmt) + v_type = args[0] + s_success = self.mkstate_concrete_return_of(stmt, 0) + + s_failure = self.mkstate_concrete_return_of(stmt, -1) + s_failure.set_exception('PyExc_MemoryError') # various possible errors + + return self.make_transitions_for_fncall(stmt, s_success, s_failure) + + + ######################################################################## # (end of Python API implementations) ########################################################################

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

gcc-python-plugin-commits September 2011