diff options
| author | Greg Clayton <gclayton@apple.com> | 2013-01-25 18:06:21 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2013-01-25 18:06:21 +0000 |
| commit | c7bece56faa5eef1c3d141d0c0b0b68b28a9aed2 (patch) | |
| tree | 9a0132fc3b0bb4f38d06a0f352ee75ac57994771 /lldb/source/Interpreter/PythonDataObjects.cpp | |
| parent | d0ed6c249dbd6bd488b6491b536a387548c00f7e (diff) | |
| download | bcm5719-llvm-c7bece56faa5eef1c3d141d0c0b0b68b28a9aed2.tar.gz bcm5719-llvm-c7bece56faa5eef1c3d141d0c0b0b68b28a9aed2.zip | |
<rdar://problem/13069948>
Major fixed to allow reading files that are over 4GB. The main problems were that the DataExtractor was using 32 bit offsets as a data cursor, and since we mmap all of our object files we could run into cases where if we had a very large core file that was over 4GB, we were running into the 4GB boundary.
So I defined a new "lldb::offset_t" which should be used for all file offsets.
After making this change, I enabled warnings for data loss and for enexpected implicit conversions temporarily and found a ton of things that I fixed.
Any functions that take an index internally, should use "size_t" for any indexes and also should return "size_t" for any sizes of collections.
llvm-svn: 173463
Diffstat (limited to 'lldb/source/Interpreter/PythonDataObjects.cpp')
| -rw-r--r-- | lldb/source/Interpreter/PythonDataObjects.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lldb/source/Interpreter/PythonDataObjects.cpp b/lldb/source/Interpreter/PythonDataObjects.cpp index 5b8ec527739..8cd4db999a7 100644 --- a/lldb/source/Interpreter/PythonDataObjects.cpp +++ b/lldb/source/Interpreter/PythonDataObjects.cpp @@ -316,8 +316,14 @@ PythonDictionary::GetItemForKeyAsInteger (const PythonString &key, int64_t fail_ if (m_py_obj && key) { PyObject *py_obj = PyDict_GetItem(m_py_obj, key.GetPythonObject()); - if (py_obj && PyInt_Check(py_obj)) - return PyInt_AsLong(py_obj); + if (py_obj) + { + if (PyInt_Check(py_obj)) + return PyInt_AsLong(py_obj); + + if (PyLong_Check(py_obj)) + return PyLong_AsLong(py_obj); + } } return fail_value; } |

