restore null object deser while still protecting against segfault in numpy parser

PYTHON-550
This commit is contained in:
Adam Holmberg
2016-04-27 14:12:54 -05:00
parent 4e6468574f
commit fbe53a53a3

View File

@@ -148,7 +148,7 @@ cdef inline int unpack_row(
get_buf(reader, &buf)
arr = arrays[i]
if buf.size < 0 or (buf.size == 0 and not arr.empty_binary_ok):
if (buf.size == 0 and not arr.empty_binary_ok) or (buf.size < 0 and not arr.is_object):
raise ValueError("Cannot handle NULL value")
if arr.is_object: