Mercurial > vim
changeset 5426:9cedb4dfd4c8 v7.4.063
updated for version 7.4.063
Problem: Crash when using invalid key in Python dictionary.
Solution: Check for object to be NULL. Add tests. (ZyX)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Mon, 04 Nov 2013 00:34:53 +0100 |
| parents | 9521463d4fc1 |
| children | e18ccf598503 |
| files | src/if_py_both.h src/testdir/test86.in src/testdir/test86.ok src/testdir/test87.in src/testdir/test87.ok src/version.c |
| diffstat | 6 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -1624,6 +1624,9 @@ DictionaryContains(DictionaryObject *sel PyObject *rObj = _DictionaryItem(self, keyObject, DICT_FLAG_RETURN_BOOL); int ret; + if (rObj == NULL) + return -1; + ret = (rObj == Py_True); Py_DECREF(rObj);
--- a/src/testdir/test86.in +++ b/src/testdir/test86.in @@ -1088,6 +1088,9 @@ ee('d.get("a", 2, 3)') stringtochars_test('d.get(%s)') ee('d.pop("a")') ee('dl.pop("a")') +cb.append(">> DictionaryContains") +ee('"" in d') +ee('0 in d') cb.append(">> DictionaryIterNext") ee('for i in ned: ned["a"] = 1') del i
--- a/src/testdir/test86.ok +++ b/src/testdir/test86.ok @@ -516,6 +516,9 @@ d.get("\0"):TypeError:('expected string <<< Finished d.pop("a"):KeyError:('a',) dl.pop("a"):error:('dictionary is locked',) +>> DictionaryContains +"" in d:ValueError:('empty keys are not allowed',) +0 in d:TypeError:('expected str() or unicode() instance, but got int',) >> DictionaryIterNext for i in ned: ned["a"] = 1:RuntimeError:('hashtab changed during iteration',) >> DictionaryAssItem
--- a/src/testdir/test87.in +++ b/src/testdir/test87.in @@ -1039,6 +1039,9 @@ ee('d.get("a", 2, 3)') stringtochars_test('d.get(%s)') ee('d.pop("a")') ee('dl.pop("a")') +cb.append(">> DictionaryContains") +ee('"" in d') +ee('0 in d') cb.append(">> DictionaryIterNext") ee('for i in ned: ned["a"] = 1') del i
--- a/src/testdir/test87.ok +++ b/src/testdir/test87.ok @@ -505,6 +505,9 @@ d.get("\0"):(<class 'TypeError'>, TypeEr <<< Finished d.pop("a"):(<class 'KeyError'>, KeyError('a',)) dl.pop("a"):(<class 'vim.error'>, error('dictionary is locked',)) +>> DictionaryContains +"" in d:(<class 'ValueError'>, ValueError('empty keys are not allowed',)) +0 in d:(<class 'TypeError'>, TypeError('expected bytes() or str() instance, but got int',)) >> DictionaryIterNext for i in ned: ned["a"] = 1:(<class 'RuntimeError'>, RuntimeError('hashtab changed during iteration',)) >> DictionaryAssItem