diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-09-20 20:02:21 -0700 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-09-20 22:40:46 -0700 |
| commit | a7393449eba9fc5173934096651b2fa232ae6764 (patch) | |
| tree | 30526d173ef16a17a6bb6bfd1464939200e015b9 /lib | |
| parent | 5dd47eeac275d8a9da0a47fda3d71f69ee6c0c4a (diff) | |
| download | samba-a7393449eba9fc5173934096651b2fa232ae6764.tar.gz samba-a7393449eba9fc5173934096651b2fa232ae6764.tar.bz2 samba-a7393449eba9fc5173934096651b2fa232ae6764.zip | |
pidl: Fix segfault when accessing unicode objects.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/talloc/pytalloc.c | 9 | ||||
| -rw-r--r-- | lib/talloc/pytalloc.h | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c index c9c6027fe0..054704f42d 100644 --- a/lib/talloc/pytalloc.c +++ b/lib/talloc/pytalloc.c @@ -119,12 +119,3 @@ PyObject *PyString_FromString_check_null(const char *ptr) } return PyString_FromString(ptr); } - -PyObject *PyUnicode_Decode_check_null(const void *ptr, size_t len, - const char *charset, const char *options) -{ - if (ptr == NULL) { - Py_RETURN_NONE; - } - return PyUnicode_Decode(ptr, len, charset, options); -} diff --git a/lib/talloc/pytalloc.h b/lib/talloc/pytalloc.h index caa388ac50..4782756352 100644 --- a/lib/talloc/pytalloc.h +++ b/lib/talloc/pytalloc.h @@ -55,7 +55,5 @@ PyObject *py_talloc_default_repr(PyObject *py_obj); PyObject *PyCObject_FromTallocPtr(void *); PyObject *PyString_FromString_check_null(const char *ptr); -PyObject *PyUnicode_Decode_check_null(const void *ptr, size_t len, - const char *charset, const char *options); #endif /* _PY_TALLOC_H_ */ |