Skip to content
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.

Sign up for GitHub

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

Jump to bottom

bpo-34492: Python/coreconfig.c: Fix _Py_wstrlist_copy() #8910

Merged
merged 2 commits into from
Aug 24, 2018
Merged

bpo-34492: Python/coreconfig.c: Fix _Py_wstrlist_copy() #8910

merged 2 commits into from
Aug 24, 2018

Conversation

izbyshev
Copy link
Contributor

@izbyshev izbyshev commented Aug 24, 2018 •
edited
Loading

  • Add missing NULL check reported by Svace static analyzer.
  • Fix _Py_wstrlist_clear() call on a wrong list.

https://bugs.python.org/issue34492

bpo-34492: Python/coreconfig.c: Add missing NULL check to _Py_wstrlis…
ff12462 
…t_copy()

Reported by Svace static analyzer.
vstinner
vstinner requested changes Aug 24, 2018
View reviewed changes
Python/coreconfig.c
@@ -69,6 +69,9 @@ _Py_wstrlist_copy(int len, wchar_t **list)
assert((len > 0 && list != NULL) || len == 0);
size_t size = len * sizeof(list[0]);
wchar_t **list_copy = PyMem_RawMalloc(size);
if (list_copy == NULL) {
return NULL;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is another bug below: _Py_wstrlist_clear(i, list), it should be list_copy, not list.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks!

@bedevere-bot
Copy link

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@izbyshev izbyshev changed the title bpo-34492: Python/coreconfig.c: Add missing NULL check to _Py_wstrlis… bpo-34492: Python/coreconfig.c: Fix _Py_wstrlist_copy() Aug 24, 2018
vstinner
vstinner approved these changes Aug 24, 2018
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@vstinner vstinner merged commit eb746db into python:master Aug 24, 2018
@miss-islington
Copy link
Contributor

Thanks @izbyshev for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @izbyshev and @vstinner, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker eb746dbae8b320758ee08f811316d7f283435cc0 3.7

@izbyshev izbyshev deleted the bpo-34492 branch August 24, 2018 23:38
izbyshev pushed a commit to izbyshev/cpython that referenced this pull request Aug 25, 2018
[3.7] bpo-34492: Modules/main.c: Fix copy_wstrlist() (pythonGH-8910)
f5491f8 
* Add missing NULL check reported by Svace static analyzer.
* Fix clear_wstrlist() call on a wrong list.

(cherry picked from commit eb746db)

Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>
@bedevere-bot
Copy link

GH-8922 is a backport of this pull request to the 3.7 branch.

vstinner pushed a commit that referenced this pull request Aug 25, 2018
@vstinner
[3.7] bpo-34492: Modules/main.c: Fix copy_wstrlist() (GH-8910) (GH-8922)
388bd4b 
* Add missing NULL check reported by Svace static analyzer.
* Fix clear_wstrlist() call on a wrong list.

(cherry picked from commit eb746db)

Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>
CuriousLearner added a commit to CuriousLearner/cpython that referenced this pull request Aug 27, 2018
@CuriousLearner
Merge branch 'master' into fix-issue24255
c50bb33 
* master: (104 commits)
  Fast path for exact floats in math.hypot() and math.dist() (pythonGH-8949)
  Remove AIX workaround test_subprocess (pythonGH-8939)
  bpo-34503: Fix refleak in PyErr_SetObject() (pythonGH-8934)
  closes bpo-34504: Remove the useless NULL check in PySequence_Check(). (pythonGH-8935)
  closes bpo-34501: PyType_FromSpecWithBases: Check spec->name before dereferencing it. (pythonGH-8930)
  closes bpo-34502: Remove a note about utf8_mode from sys.exit() docs. (pythonGH-8928)
  Remove unneeded PyErr_Clear() in _winapi_SetNamedPipeHandleState_impl() (pythonGH-8281)
  Fix markup in stdtypes documentation (pythonGH-8905)
  bpo-34395: Don't free allocated memory on realloc fail in load_mark() in _pickle.c. (pythonGH-8788)
  Fix upsizing of marks stack in pickle module. (pythonGH-8860)
  bpo-34171: Prevent creating Lib/trace.cover when run the trace module. (pythonGH-8841)
  closes bpo-34493: Objects/genobject.c: Add missing NULL check to compute_cr_origin() (pythonGH-8911)
  Fixed typo with asynccontextmanager code example (pythonGH-8845)
  bpo-34426: fix typo (__lltrace__ -> __ltrace__) (pythonGH-8822)
  bpo-13312: Avoid int underflow in time year. (pythonGH-8912)
  bpo-34492: Python/coreconfig.c: Fix _Py_wstrlist_copy() (pythonGH-8910)
  bpo-34448: Improve output of usable wchar_t check (pythonGH-8846)
  closes bpo-34471: _datetime: Add missing NULL check to tzinfo_from_isoformat_results. (pythonGH-8869)
  bpo-6700: Fix inspect.getsourcelines for module level frames/tracebacks (pythonGH-8864)
  Fix typo in the dataclasses's doc (pythonGH-8896)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner vstinner approved these changes

Assignees

@vstinner vstinner

Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@izbyshev @bedevere-bot @miss-islington @vstinner @the-knights-who-say-ni