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

Bug 386610 - "pyxpcom fails to build against python 2.5 (api changed)" [p=asac@jwsdot.com (Alexander Sack) r=mhammond (NPOTB)]

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@242424 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
reed%reedloden.com
2008-01-05 06:32:35 +00:00
parent 5abc8ff486
commit 916d8e462a
3 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/extensions/python/xpcom/src/PyIInputStream.cpp
View File

@@ -65,12 +65,19 @@ static PyObject *DoPyRead_Buffer(nsIInputStream *pI, PyObject *obBuffer, PRUint3
{
PRUint32 nread;
void *buf;
PRUint32 buf_len;
if (PyObject_AsWriteBuffer(obBuffer, &buf, (int *)&buf_len) != 0) {
Py_ssize_t buf_len;
if (PyObject_AsWriteBuffer(obBuffer, &buf, &buf_len) != 0) {
PyErr_Clear();
PyErr_SetString(PyExc_TypeError, "The buffer object does not have a write buffer!");
return NULL;
}
if ( (buf_len & 0xFFFFFFFF) != buf_len) {
PyErr_Clear();
PyErr_SetString(PyExc_RuntimeError, "Python Buffer length overflows 32-bit in PyObject_AsWriteBuffer");
return NULL;
}
if (n==(PRUint32)-1) {
n = buf_len;
} else {
@@ -116,11 +123,17 @@ static PyObject *DoPyRead_Size(nsIInputStream *pI, PRUint32 n)
rc = PyBuffer_New(nread);
if (rc != NULL) {
void *ob_buf;
PRUint32 buf_len;
if (PyObject_AsWriteBuffer(rc, &ob_buf, (int *)&buf_len) != 0) {
Py_ssize_t buf_len;
if (PyObject_AsWriteBuffer(rc, &ob_buf, &buf_len) != 0) {
// should never fail - we just created it!
return NULL;
}
if ( (buf_len & 0xFFFFFFFF) != buf_len) {
PyErr_SetString(PyExc_RuntimeError, "Python Buffer length overflows 32-bit in PyObject_AsWriteBuffer");
return NULL;
}
if (buf_len != nread) {
PyErr_SetString(PyExc_RuntimeError, "New buffer isn't the size we created it!");
return NULL;