dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix segfault in r_list for null pointers

This commit is contained in:
pancake 2010-12-17 10:58:38 +01:00
parent 13b04ecaf6
commit 7725fc7136
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/include/r_list.h
View File

@ -31,7 +31,7 @@ typedef struct r_oflist_t {
for (it = list->head; it && (pos = it->data); it = it->n)
#define r_list_foreach_prev(list, it, pos) \
for (it = list->tail; it && (pos = it->data); it = it->p)
#define r_list_iterator(x) (x)->head
#define r_list_iterator(x) (x)?(x)->head:NULL
#define r_list_empty(x) (x->head==NULL && x->tail==NULL)
#define r_list_head(x) x->head
#define r_list_tail(x) x->tail

32
libr/lang/p/python.c
View File

@ -185,8 +185,30 @@ static void init_radare_module(void) {
"Example module that creates an extension type.");
}
#else
static void init_radare_module(void) {
eprintf ("TODO: python>3.x instantiate 'r' object\n");
/*
SEE
static PyMethodDef EmbMethods[] = {
{"numargs", emb_numargs, METH_VARARGS,
"Return the number of arguments received by the process."},
{NULL, NULL, 0, NULL}
};
*/
static PyModuleDef EmbModule = {
PyModuleDef_HEAD_INIT, "radare", NULL, -1, NULL, //EmbMethods,
NULL, NULL, NULL, NULL
};
static int init_radare_module(void) {
// TODO import r2-swig api
//eprintf ("TODO: python>3.x instantiate 'r' object\n");
PyObject *m = PyModule_Create (&EmbModule);
if (m == NULL) {
eprintf ("Cannot create python3 r2 module\n");
return R_FALSE;
}
return R_TRUE;
}
#endif
/* -init- */
@ -221,11 +243,7 @@ static int setup(RLang *lang) {
static int init(RLang *lang) {
core = lang->user;
Py_Initialize ();
init_radare_module ();
//Py_InitModule3("radare", Radare_methods, NULL);
// PyRun_SimpleString("import radare");
// PyRun_SimpleString("from radare import *");
return R_TRUE;
return init_radare_module ();
}
static int fini(void *user) {