Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unicode handling for octet arrays, and finally fix the test suite

Browse Source 
for Python 2.2.

Not part of the build.


git-svn-id: svn://10.0.0.236/trunk@101632 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
markh%activestate.com
2001-08-22 05:33:05 +00:00
parent dc74067145
commit 243cc35e4f
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/extensions/python/xpcom/src/VariantUtils.cpp
View File

@@ -206,11 +206,23 @@ PRBool FillSingleArray(void *array_ptr, PyObject *sequence_ob, PRUint32 sequence
PRUint8 *pthis = (PRUint8 *)array_ptr;
NS_ABORT_IF_FALSE(pthis, "Don't have a valid array to fill!");
PRBool rc = PR_TRUE;
// We handle T_U8 specially as a string.
// We handle T_U8 specially as a string/Unicode.
// If it is NOT a string, we just fall through and allow the standard
// sequence unpack code process it (just slower!)
if ( (array_type & XPT_TDP_TAGMASK) == nsXPTType::T_U8 && PyString_Check(sequence_ob)) {
if ( (array_type & XPT_TDP_TAGMASK) == nsXPTType::T_U8 &&
(PyString_Check(sequence_ob) || PyUnicode_Check(sequence_ob))) {
PRBool release_seq;
if (PyUnicode_Check(sequence_ob)) {
release_seq = PR_TRUE;
sequence_ob = PyObject_Str(sequence_ob);
} else
release_seq = PR_FALSE;
if (!sequence_ob) // presumably a memory error, or Unicode encoding error.
return PR_FALSE;
nsCRT::memcpy(pthis, PyString_AS_STRING(sequence_ob), sequence_size);
if (release_seq)
Py_DECREF(sequence_ob);
return PR_TRUE;
}