Fixed tuple to List Conversion in Dataframe class (#25089)

pandas-dev · Feb 6, 2019 · f04bb2f · f04bb2f
1 parent e3b0950
commit f04bb2f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/doc/source/whatsnew/v0.24.2.rst b/doc/source/whatsnew/v0.24.2.rst
@@ -22,6 +22,8 @@ Fixed Regressions
 
 - Fixed regression in :meth:`DataFrame.all` and :meth:`DataFrame.any` where ``bool_only=True`` was ignored (:issue:`25101`)
 
+- Fixed issue in ``DataFrame`` construction with passing a mixed list of mixed types could segfault. (:issue:`25075`)
+
 .. _whatsnew_0242.enhancements:
 
 Enhancements
@@ -94,4 +96,4 @@ Bug Fixes
 Contributors
 ~~~~~~~~~~~~
 
-.. contributors:: v0.24.1..v0.24.2
+.. contributors:: v0.24.1..v0.24.2
diff --git a/pandas/_libs/lib.pyx b/pandas/_libs/lib.pyx
@@ -2277,7 +2277,7 @@ def to_object_array(rows: object, int min_width=0):
     result = np.empty((n, k), dtype=object)
 
     for i in range(n):
-        row = <list>input_rows[i]
+        row = list(input_rows[i])
 
         for j in range(len(row)):
             result[i, j] = row[j]

diff --git a/pandas/tests/frame/test_constructors.py b/pandas/tests/frame/test_constructors.py
@@ -1183,6 +1183,13 @@ def test_constructor_mixed_dict_and_Series(self):
                              index=['a', 'b'])
         tm.assert_frame_equal(result, expected)
 
+    def test_constructor_mixed_type_rows(self):
+        # Issue 25075
+        data = [[1, 2], (3, 4)]
+        result = DataFrame(data)
+        expected = DataFrame([[1, 2], [3, 4]])
+        tm.assert_frame_equal(result, expected)
+
     def test_constructor_tuples(self):
         result = DataFrame({'A': [(1, 2), (3, 4)]})
         expected = DataFrame({'A': Series([(1, 2), (3, 4)])})