vim: src/if_py_both.h comparison

comparison src/if_py_both.h @ 4659:80b0081824fa v7.3.1077

updated for version 7.3.1077 Problem: Python: Allocating dict the wrong way, causing a crash. Solution: Use py_dict_alloc(). Fix some exception problems. (ZyX)

author	Bram Moolenaar <bram@vim.org>
date	Thu, 30 May 2013 22:06:33 +0200
parents	b943fd24c351
children	9e7ef781d494

comparison

equal deleted inserted replaced

-:3be23951aa25
+:80b0081824fa
 #endif
 #define DOPY_FUNC "_vim_pydo"
 #define PyErr_SetVim(str) PyErr_SetString(VimError, str)
+#define RAISE_NO_EMPTY_KEYS PyErr_SetString(PyExc_ValueError, \
+						_("empty keys are not allowed"))
 #define INVALID_BUFFER_VALUE ((buf_T *)(-1))
 #define INVALID_WINDOW_VALUE ((win_T *)(-1))
 #define INVALID_TABPAGE_VALUE ((tabpage_T *)(-1))
-#define DICTKEY_DECL \
-PyObject	*dictkey_todecref = NULL;
-#define DICTKEY_GET(err, decref) \
-if (!(key = StringToChars(keyObject, &dictkey_todecref))) \
-{ \
-	if (decref) \
-	{ \
-	    Py_DECREF(keyObject); \
-	} \
-	return err; \
-} \
-if (decref && !dictkey_todecref) \
-	dictkey_todecref = keyObject; \
-if (*key == NUL) \
-{ \
-	PyErr_SetString(PyExc_ValueError, _("empty keys are not allowed")); \
-	return err; \
-}
-#define DICTKEY_UNREF \
-Py_XDECREF(dictkey_todecref);
 typedef void (*rangeinitializer)(void *);
 typedef void (*runner)(const char *, void *
 #ifdef PY_CAN_RECURSE
 	, PyGILState_STATE *
 PyObject	*r;
 char_u	*key;
 dictitem_T	*di;
 dict_T	*dict = self->dict;
 hashitem_T	*hi;
+PyObject	*todecref;
-DICTKEY_DECL
 if (flags & DICT_FLAG_HAS_DEFAULT)
 {
 	if (!PyArg_ParseTuple(args, "O|O", &keyObject, &defObject))
 	    return NULL;
 	keyObject = args;
 if (flags & DICT_FLAG_RETURN_BOOL)
 	defObject = Py_False;
-DICTKEY_GET(NULL, 0)
+if (!(key = StringToChars(keyObject, &todecref)))
+	return NULL;
+if (*key == NUL)
+{
+	RAISE_NO_EMPTY_KEYS;
+	return NULL;
+}
 hi = hash_find(&dict->dv_hashtab, key);
-DICTKEY_UNREF
+Py_XDECREF(todecref);
 if (HASHITEM_EMPTY(hi))
 {
 	if (defObject)
 	{
 {
 char_u	*key;
 typval_T	tv;
 dict_T	*dict = self->dict;
 dictitem_T	*di;
-DICTKEY_DECL
+PyObject	*todecref;
 if (dict->dv_lock)
 {
 	PyErr_SetVim(_("dict is locked"));
 	return -1;
 }
-DICTKEY_GET(-1, 0)
+if (!(key = StringToChars(keyObject, &todecref)))
+	return -1;
+if (*key == NUL)
+{
+	RAISE_NO_EMPTY_KEYS;
+	return -1;
+}
 di = dict_find(dict, key, -1);
 if (valObject == NULL)
 {
 	hashitem_T	*hi;
 	if (di == NULL)
 	{
-	    DICTKEY_UNREF
+	    Py_XDECREF(todecref);
 	    PyErr_SetObject(PyExc_KeyError, keyObject);
 	    return -1;
 	}
 	hi = hash_find(&dict->dv_hashtab, di->di_key);
 	hash_remove(&dict->dv_hashtab, hi);
 if (di == NULL)
 {
 	if (!(di = dictitem_alloc(key)))
 	{
+	    Py_XDECREF(todecref);
 	    PyErr_NoMemory();
 	    return -1;
 	}
 	di->di_tv.v_lock = 0;
 	di->di_tv.v_type = VAR_UNKNOWN;
 	if (dict_add(dict, di) == FAIL)
 	{
-	    DICTKEY_UNREF
+	    Py_XDECREF(todecref);
 	    vim_free(di);
 	    dictitem_free(di);
 	    PyErr_SetVim(_("failed to add key to dictionary"));
 	    return -1;
 	}
 }
 else
 	clear_tv(&di->di_tv);
-DICTKEY_UNREF
+Py_XDECREF(todecref);
 copy_tv(&tv, &di->di_tv);
 clear_tv(&tv);
 return 0;
 }
 {
 char_u	*key;
 int		flags;
 long	numval;
 char_u	*stringval;
-DICTKEY_DECL
+PyObject	*todecref;
 if (self->Check(self->from))
 	return NULL;
-DICTKEY_GET(NULL, 0)
+if (!(key = StringToChars(keyObject, &todecref)))
+	return NULL;
+if (*key == NUL)
+{
+	RAISE_NO_EMPTY_KEYS;
+	return NULL;
+}
 flags = get_option_value_strict(key, &numval, &stringval,
 				    self->opt_type, self->from);
-DICTKEY_UNREF
+Py_XDECREF(todecref);
 if (flags == 0)
 {
 	PyErr_SetObject(PyExc_KeyError, keyObject);
 	return NULL;
 {
 char_u	*key;
 int		flags;
 int		opt_flags;
 int		r = 0;
-DICTKEY_DECL
+PyObject	*todecref;
 if (self->Check(self->from))
 	return -1;
-DICTKEY_GET(-1, 0)
+if (!(key = StringToChars(keyObject, &todecref)))
+	return -1;
+if (*key == NUL)
+{
+	RAISE_NO_EMPTY_KEYS;
+	return -1;
+}
 flags = get_option_value_strict(key, NULL, NULL,
 				    self->opt_type, self->from);
 if (flags == 0)
 {
 	PyErr_SetObject(PyExc_KeyError, keyObject);
-	DICTKEY_UNREF
+	Py_XDECREF(todecref);
 	return -1;
 }
 if (valObject == NULL)
 {
 	if (self->opt_type == SREQ_GLOBAL)
 	{
 	    PyErr_SetString(PyExc_ValueError,
 		    _("unable to unset global option"));
-	    DICTKEY_UNREF
+	    Py_XDECREF(todecref);
 	    return -1;
 	}
 	else if (!(flags & SOPT_GLOBAL))
 	{
 	    PyErr_SetString(PyExc_ValueError, _("unable to unset option "
 						"without global value"));
-	    DICTKEY_UNREF
+	    Py_XDECREF(todecref);
 	    return -1;
 	}
 	else
 	{
 	    unset_global_local_option(key, self->from);
-	    DICTKEY_UNREF
+	    Py_XDECREF(todecref);
 	    return 0;
 	}
 }
 opt_flags = (self->opt_type ? OPT_LOCAL : OPT_GLOBAL);
 	if (PyLong_Check(valObject))
 	    val = PyLong_AsLong(valObject);
 	else
 	{
 	    PyErr_SetString(PyExc_TypeError, _("object must be integer"));
-	    DICTKEY_UNREF
+	    Py_XDECREF(todecref);
 	    return -1;
 	}
 	r = set_option_value_for(key, val, NULL, opt_flags,
 				self->opt_type, self->from);
 	}
 	else
 	    r = -1;
 }
-DICTKEY_UNREF
+Py_XDECREF(todecref);
 return r;
 }
 static PyMappingMethods OptionsAsMapping = {
 dictitem_T	*di;
 PyObject	*keyObject;
 PyObject	*valObject;
 Py_ssize_t	iter = 0;
-if (!(dict = dict_alloc()))
+if (!(dict = py_dict_alloc()))
 	return -1;
 tv->v_type = VAR_DICT;
 tv->vval.v_dict = dict;
 	}
 	if (*key == NUL)
 	{
 	    dict_unref(dict);
 	    Py_XDECREF(todecref);
+	    RAISE_NO_EMPTY_KEYS;
 	    return -1;
 	}
 	di = dictitem_alloc(key);
 PyObject	*list;
 PyObject	*iterator;
 PyObject	*keyObject;
 PyObject	*valObject;
-if (!(dict = dict_alloc()))
+if (!(dict = py_dict_alloc()))
 	return -1;
 tv->v_type = VAR_DICT;
 tv->vval.v_dict = dict;
 	{
 	    Py_DECREF(keyObject);
 	    Py_DECREF(iterator);
 	    Py_XDECREF(todecref);
 	    dict_unref(dict);
+	    RAISE_NO_EMPTY_KEYS;
 	    return -1;
 	}
 	if (!(valObject = PyObject_GetItem(obj, keyObject)))
 	{

Mercurial > vim

comparison src/if_py_both.h @ 4659:80b0081824fa v7.3.1077