mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Partial fix for string handling. Null byte TBD.

This commit is contained in:
Jack Jansen 2002-05-08 15:29:33 +00:00
parent c9abc1de6b
commit 1df628ddce
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mac/Modules/cf/pycfbridge.c
View File

@ -53,7 +53,7 @@ PyCF_CF2Python_sequence(CFArrayRef src) {
if (item_cf == NULL ) goto err; if (item_cf == NULL ) goto err;
item_py = PyCF_CF2Python(item_cf); item_py = PyCF_CF2Python(item_cf);
if (item_py == NULL ) goto err; if (item_py == NULL ) goto err;
if (!PyList_SetItem(rv, i, item_py)) goto err; if (PyList_SetItem(rv, i, item_py) < 0) goto err;
item_py = NULL; item_py = NULL;
} }
return rv; return rv;
@ -86,7 +86,7 @@ PyCF_CF2Python_mapping(CFTypeRef src) {
if (key_py == NULL ) goto err; if (key_py == NULL ) goto err;
value_py = PyCF_CF2Python(value_py); value_py = PyCF_CF2Python(value_py);
if (value_py == NULL ) goto err; if (value_py == NULL ) goto err;
if (!PyDict_SetItem(rv, key_py, value_py)) goto err; if (PyDict_SetItem(rv, key_py, value_py) < 0) goto err;
key_py = NULL; key_py = NULL;
value_py = NULL; value_py = NULL;
} }
@ -135,6 +135,8 @@ PyCF_CF2Python_string(CFStringRef src) {
int int
PyCF_Python2CF(PyObject *src, CFTypeRef *dst) { PyCF_Python2CF(PyObject *src, CFTypeRef *dst) {
if (PyString_Check(src) || PyUnicode_Check(src))
return PyCF_Python2CF_simple(src, dst);
if (PySequence_Check(src)) if (PySequence_Check(src))
return PyCF_Python2CF_sequence(src, (CFArrayRef *)dst); return PyCF_Python2CF_sequence(src, (CFArrayRef *)dst);
if (PyMapping_Check(src)) if (PyMapping_Check(src))