[Numpy-svn] [numpy/numpy] 163a6f: BUG: Fix segfault in PyArray_OrderConverter

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: 163a6f96e81eed44c9c58d54615b5bcbcad67bec
      https://github.com/numpy/numpy/commit/163a6f96e81eed44c9c58d54615b5bcbcad67bec
  Author: Simon Gibbons <simongibbons at gmail.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M numpy/core/src/multiarray/conversion_utils.c
    M numpy/core/tests/test_multiarray.py

  Log Message:
  -----------
  BUG: Fix segfault in PyArray_OrderConverter

This fixes a bug in PyArray_OrderConverter where
if a unicode string is passed in which cannot
be converted to ASCII then Py_DECREF would
be called on a null pointer.

Fixes #7475


  Commit: 25d60a989766e630b92a79284388845ade96d3d0
      https://github.com/numpy/numpy/commit/25d60a989766e630b92a79284388845ade96d3d0
  Author: Jaime <jaime.frio at gmail.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M numpy/core/src/multiarray/conversion_utils.c
    M numpy/core/tests/test_multiarray.py

  Log Message:
  -----------
  Merge pull request #7481 from simongibbons/orderconverter_fix

BUG: Fix segfault in PyArray_OrderConverter


Compare: https://github.com/numpy/numpy/compare/75c5af30d713...25d60a989766