jepler/python-fuse
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bogus conversion from Python integer types to C ones when C-ifying system structures.

Browse source 
Bug reported by David Loveall.
This commit is contained in:
dzsekijo 2006-11-29 17:39:02 +00:00
parent caffe5fd92
commit d13419ac6f
2 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2006-11-29 Csaba Henk <csaba.henk@creo.hu>
* Fix bogus conversion from Python integer types to C ones when
C-ifying system structures. Bug reported by David Loveall.
2006-10-14 Csaba Henk <csaba.henk@creo.hu>
* Make fuse-python API explicitly specifiable instead of just having
a compat hook.

35
fuseparts/_fusemodule.c
View file

@ -84,13 +84,36 @@ fi_to_py(struct fuse_file_info *fi)
#define fetchattr_nam(st, attr, aname) \
if (!(tmp = PyObject_GetAttrString(v, aname))) \
goto OUT_DECREF; \
if (!(PyInt_Check(tmp) || PyLong_Check(tmp))) { \
Py_DECREF(tmp); \
goto OUT_DECREF; \
if (PyInt_Check(tmp) && sizeof((st)->attr) <= sizeof(long)) { \
/* \
* We'd rather use here PyInt_AsUnsignedLong() here \
* but there is no such thing. Closest match is \
* PyInt_AsUnsignedLongMask() but that doesn't check \
* for overflows. Duh. \
*/ \
(st)->attr = PyInt_AsLong(tmp); \
if ((unsigned long)(st)->attr > LONG_MAX) { \
Py_DECREF(tmp); \
goto OUT_DECREF; \
} \
} else { \
if (PyInt_Check(tmp)) \
/* \
* This fnc doesn't catch overflows but I guess \
* it shouldn't overflow after passing \
* PyInt_Check() ... \
*/ \
(st)->attr = PyInt_AsUnsignedLongLongMask(tmp); \
else if (PyLong_Check(tmp)) \
(st)->attr = PyLong_AsUnsignedLongLong(tmp); \
else { \
Py_DECREF(tmp); \
goto OUT_DECREF; \
} \
} \
(st)->attr = PyInt_Check(tmp) ? PyInt_AsLong(tmp) : \
(PyLong_Check(tmp) ? PyLong_AsLong(tmp) : 0); \
Py_DECREF(tmp);
Py_DECREF(tmp); \
if (PyErr_Occurred()) \
goto OUT_DECREF;
#define fetchattr(st, attr) \
fetchattr_nam(st, attr, #attr)