GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — bpo-29438: fixed use-after-free in key sharing dict by methane · Pull Request #17 · python/cpython

bpo-29438: fixed use-after-free in key sharing dict #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

methane merged 1 commit into python:master from methane:bpo29438/fix-dict-useafterfree

Feb 12, 2017

+9 −3

Merged

bpo-29438: fixed use-after-free in key sharing dict #17

Show file tree

Hide file tree

Changes from all commits

Commits

Show all changes

1 commit

Select commit

bf8bd7e

bpo-29438: fixed use-after-free in key sharing dict

methane Feb 11, 2017

File filter

Filter by extension .c (1) No extension (1) All 2 file types selected

Viewed files

Clear filters

Conversations

Failed to load comments.

Uh oh!

There was an error while loading. Please reload this page.

Jump to

Jump to file

Failed to load files.

Uh oh!

There was an error while loading. Please reload this page.

Diff view

Unified

Split

Hide whitespace

Diff view

Unified

Split

Hide whitespace

There are no files selected for viewing

2 changes: 2 additions & 0 deletions 2 Misc/NEWS

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,6 +10,8 @@ What's New in Python 3.7.0 alpha 1?
		Core and Builtins
		-----------------

		- bpo-29438: Fixed use-after-free problem in key sharing dict.

		- Issue #29319: Prevent RunMainFromImporter overwriting sys.path[0].

		- Issue #29337: Fixed possible BytesWarning when compare the code objects.
Expand Down

10 changes: 7 additions & 3 deletions 10 Objects/dictobject.c

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -4352,15 +4352,19 @@ _PyObjectDict_SetItem(PyTypeObject tp, PyObject *dictptr,
		}
		if (value == NULL) {
		res = PyDict_DelItem(dict, key);
		if (cached != ((PyDictObject *)dict)->ma_keys) {
		// Since key sharing dict doesn't allow deletion, PyDict_DelItem()
		// always converts dict to combined form.
		if ((cached = CACHED_KEYS(tp)) != NULL) {
		CACHED_KEYS(tp) = NULL;
		DK_DECREF(cached);
		}
		}
		else {
		int was_shared = cached == ((PyDictObject *)dict)->ma_keys;
		int was_shared = (cached == ((PyDictObject *)dict)->ma_keys);
		res = PyDict_SetItem(dict, key, value);
		if (was_shared && cached != ((PyDictObject *)dict)->ma_keys) {
		if (was_shared &&
		(cached = CACHED_KEYS(tp)) != NULL &&
		cached != ((PyDictObject *)dict)->ma_keys) {
		/* PyDict_SetItem() may call dictresize and convert split table
		* into combined table. In such case, convert it to split
		* table again and update type's shared key only when this is
Expand Down

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.