mirror of
				https://github.com/python/cpython.git
				synced 2025-10-25 02:43:41 +00:00 
			
		
		
		
	 547397c45b
			
		
	
	
		547397c45b
		
	
	
	
	
		
			
			SF patch http://sourceforge.net/patch/?func=detailpatch&patch_id=103453&group_id=5470 PyMember_Set of T_CHAR always raises exception. Unfortunately, this is a use of a C API function that Python itself never makes, so there's no .py test I can check in to verify this stays fixed. But the fault in the code is obvious, and Dave Cole's patch just as obviously fixes it.
		
			
				
	
	
		
			246 lines
		
	
	
	
		
			5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			246 lines
		
	
	
	
		
			5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| 
 | |
| /* Map C struct members to Python object attributes */
 | |
| 
 | |
| #include "Python.h"
 | |
| 
 | |
| #include "structmember.h"
 | |
| 
 | |
| static PyObject *
 | |
| listmembers(struct memberlist *mlist)
 | |
| {
 | |
| 	int i, n;
 | |
| 	PyObject *v;
 | |
| 	for (n = 0; mlist[n].name != NULL; n++)
 | |
| 		;
 | |
| 	v = PyList_New(n);
 | |
| 	if (v != NULL) {
 | |
| 		for (i = 0; i < n; i++)
 | |
| 			PyList_SetItem(v, i,
 | |
| 				       PyString_FromString(mlist[i].name));
 | |
| 		if (PyErr_Occurred()) {
 | |
| 			Py_DECREF(v);
 | |
| 			v = NULL;
 | |
| 		}
 | |
| 		else {
 | |
| 			PyList_Sort(v);
 | |
| 		}
 | |
| 	}
 | |
| 	return v;
 | |
| }
 | |
| 
 | |
| PyObject *
 | |
| PyMember_Get(char *addr, struct memberlist *mlist, char *name)
 | |
| {
 | |
| 	struct memberlist *l;
 | |
| 	
 | |
| 	if (strcmp(name, "__members__") == 0)
 | |
| 		return listmembers(mlist);
 | |
| 	for (l = mlist; l->name != NULL; l++) {
 | |
| 		if (strcmp(l->name, name) == 0) {
 | |
| 			PyObject *v;
 | |
| 			addr += l->offset;
 | |
| 			switch (l->type) {
 | |
| 			case T_BYTE:
 | |
| 				v = PyInt_FromLong((long)
 | |
| 						 (((*(char*)addr & 0xff)
 | |
| 						   ^ 0x80) - 0x80));
 | |
| 				break;
 | |
| 			case T_UBYTE:
 | |
| 				v = PyInt_FromLong((long) *(char*)addr & 0xff);
 | |
| 				break;
 | |
| 			case T_SHORT:
 | |
| 				v = PyInt_FromLong((long) *(short*)addr);
 | |
| 				break;
 | |
| 			case T_USHORT:
 | |
| 				v = PyInt_FromLong((long)
 | |
| 						 *(unsigned short*)addr);
 | |
| 				break;
 | |
| 			case T_INT:
 | |
| 				v = PyInt_FromLong((long) *(int*)addr);
 | |
| 				break;
 | |
| 			case T_UINT:
 | |
| 				v = PyInt_FromLong((long)
 | |
| 						   *(unsigned int*)addr);
 | |
| 				break;
 | |
| 			case T_LONG:
 | |
| 				v = PyInt_FromLong(*(long*)addr);
 | |
| 				break;
 | |
| 			case T_ULONG:
 | |
| 				v = PyLong_FromDouble((double)
 | |
| 						   *(unsigned long*)addr);
 | |
| 				break;
 | |
| 			case T_FLOAT:
 | |
| 				v = PyFloat_FromDouble((double)*(float*)addr);
 | |
| 				break;
 | |
| 			case T_DOUBLE:
 | |
| 				v = PyFloat_FromDouble(*(double*)addr);
 | |
| 				break;
 | |
| 			case T_STRING:
 | |
| 				if (*(char**)addr == NULL) {
 | |
| 					Py_INCREF(Py_None);
 | |
| 					v = Py_None;
 | |
| 				}
 | |
| 				else
 | |
| 					v = PyString_FromString(*(char**)addr);
 | |
| 				break;
 | |
| 			case T_STRING_INPLACE:
 | |
| 				v = PyString_FromString((char*)addr);
 | |
| 				break;
 | |
| #ifdef macintosh
 | |
| 			case T_PSTRING:
 | |
| 				if (*(char**)addr == NULL) {
 | |
| 					Py_INCREF(Py_None);
 | |
| 					v = Py_None;
 | |
| 				}
 | |
| 				else
 | |
| 					v = PyString_FromStringAndSize(
 | |
| 						(*(char**)addr)+1,
 | |
| 						**(unsigned char**)addr);
 | |
| 				break;
 | |
| 			case T_PSTRING_INPLACE:
 | |
| 				v = PyString_FromStringAndSize(
 | |
| 					((char*)addr)+1,
 | |
| 					*(unsigned char*)addr);
 | |
| 				break;
 | |
| #endif /* macintosh */
 | |
| 			case T_CHAR:
 | |
| 				v = PyString_FromStringAndSize((char*)addr, 1);
 | |
| 				break;
 | |
| 			case T_OBJECT:
 | |
| 				v = *(PyObject **)addr;
 | |
| 				if (v == NULL)
 | |
| 					v = Py_None;
 | |
| 				Py_INCREF(v);
 | |
| 				break;
 | |
| 			default:
 | |
| 				PyErr_SetString(PyExc_SystemError,
 | |
| 						"bad memberlist type");
 | |
| 				v = NULL;
 | |
| 			}
 | |
| 			return v;
 | |
| 		}
 | |
| 	}
 | |
| 	
 | |
| 	PyErr_SetString(PyExc_AttributeError, name);
 | |
| 	return NULL;
 | |
| }
 | |
| 
 | |
| int
 | |
| PyMember_Set(char *addr, struct memberlist *mlist, char *name, PyObject *v)
 | |
| {
 | |
| 	struct memberlist *l;
 | |
| 	PyObject *oldv;
 | |
| 	
 | |
| 	for (l = mlist; l->name != NULL; l++) {
 | |
| 		if (strcmp(l->name, name) == 0) {
 | |
| #ifdef macintosh
 | |
| 			if (l->readonly || l->type == T_STRING ||
 | |
| 			    l->type == T_PSTRING)
 | |
| 			{
 | |
| #else
 | |
| 			if (l->readonly || l->type == T_STRING ) {
 | |
| #endif /* macintosh */
 | |
| 				PyErr_SetString(PyExc_TypeError,
 | |
| 						"readonly attribute");
 | |
| 				return -1;
 | |
| 			}
 | |
| 			if (v == NULL && l->type != T_OBJECT) {
 | |
| 				PyErr_SetString(PyExc_TypeError,
 | |
| 				  "can't delete numeric/char attribute");
 | |
| 				return -1;
 | |
| 			}
 | |
| 			addr += l->offset;
 | |
| 			switch (l->type) {
 | |
| 			case T_BYTE:
 | |
| 			case T_UBYTE:
 | |
| 				if (!PyInt_Check(v)) {
 | |
| 					PyErr_BadArgument();
 | |
| 					return -1;
 | |
| 				}
 | |
| 				*(char*)addr = (char) PyInt_AsLong(v);
 | |
| 				break;
 | |
| 			case T_SHORT:
 | |
| 			case T_USHORT:
 | |
| 				if (!PyInt_Check(v)) {
 | |
| 					PyErr_BadArgument();
 | |
| 					return -1;
 | |
| 				}
 | |
| 				*(short*)addr = (short) PyInt_AsLong(v);
 | |
| 				break;
 | |
| 			case T_UINT:
 | |
| 			case T_INT:
 | |
| 				if (!PyInt_Check(v)) {
 | |
| 					PyErr_BadArgument();
 | |
| 					return -1;
 | |
| 				}
 | |
| 				*(int*)addr = (int) PyInt_AsLong(v);
 | |
| 				break;
 | |
| 			case T_LONG:
 | |
| 				if (!PyInt_Check(v)) {
 | |
| 					PyErr_BadArgument();
 | |
| 					return -1;
 | |
| 				}
 | |
| 				*(long*)addr = PyInt_AsLong(v);
 | |
| 				break;
 | |
| 			case T_ULONG:
 | |
| 				if (PyInt_Check(v))
 | |
| 					*(long*)addr = PyInt_AsLong(v);
 | |
| 				else if (PyLong_Check(v))
 | |
| 					*(long*)addr = PyLong_AsLong(v);
 | |
| 				else {
 | |
| 					PyErr_BadArgument();
 | |
| 					return -1;
 | |
| 				}
 | |
| 				break;
 | |
| 			case T_FLOAT:
 | |
| 				if (PyInt_Check(v))
 | |
| 					*(float*)addr =
 | |
| 						(float) PyInt_AsLong(v);
 | |
| 				else if (PyFloat_Check(v))
 | |
| 					*(float*)addr =
 | |
| 						(float) PyFloat_AsDouble(v);
 | |
| 				else {
 | |
| 					PyErr_BadArgument();
 | |
| 					return -1;
 | |
| 				}
 | |
| 				break;
 | |
| 			case T_DOUBLE:
 | |
| 				if (PyInt_Check(v))
 | |
| 					*(double*)addr =
 | |
| 						(double) PyInt_AsLong(v);
 | |
| 				else if (PyFloat_Check(v))
 | |
| 					*(double*)addr = PyFloat_AsDouble(v);
 | |
| 				else {
 | |
| 					PyErr_BadArgument();
 | |
| 					return -1;
 | |
| 				}
 | |
| 				break;
 | |
| 			case T_OBJECT:
 | |
| 				Py_XINCREF(v);
 | |
| 				oldv = *(PyObject **)addr;
 | |
| 				*(PyObject **)addr = v;
 | |
| 				Py_XDECREF(oldv);
 | |
| 				break;
 | |
| 			case T_CHAR:
 | |
| 				if (PyString_Check(v) &&
 | |
| 				    PyString_Size(v) == 1) {
 | |
| 					*(char*)addr =
 | |
| 						PyString_AsString(v)[0];
 | |
| 				}
 | |
| 				else {
 | |
| 					PyErr_BadArgument();
 | |
| 					return -1;
 | |
| 				}
 | |
| 				break;
 | |
| 			default:
 | |
| 				PyErr_SetString(PyExc_SystemError,
 | |
| 						"bad memberlist type");
 | |
| 				return -1;
 | |
| 			}
 | |
| 			return 0;
 | |
| 		}
 | |
| 	}
 | |
| 	
 | |
| 	PyErr_SetString(PyExc_AttributeError, name);
 | |
| 	return -1;
 | |
| }
 |