My favorites | Sign in
Project Home Downloads Wiki
READ-ONLY: This project has been archived. For more information see this post.
Search
for
  Advanced search   Search tips   Subscriptions

Issue 188 attachment: pyodbc-getdata-segfault-fix.diff (1.3 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
diff --git a/src/getdata.cpp b/src/getdata.cpp
index 53670ee..7b2356d 100644
--- a/src/getdata.cpp
+++ b/src/getdata.cpp
@@ -149,13 +149,13 @@ public:
return true;
}

- if (PyString_CheckExact(bufferOwner))
+ if (bufferOwner != NULL && PyString_CheckExact(bufferOwner))
{
if (_PyString_Resize(&bufferOwner, newSize) == -1)
return false;
buffer = PyString_AS_STRING(bufferOwner);
}
- else if (PyUnicode_CheckExact(bufferOwner))
+ else if (bufferOwner != NULL && PyUnicode_CheckExact(bufferOwner))
{
if (PyUnicode_Resize(&bufferOwner, newSize / element_size) == -1)
return false;
@@ -192,7 +192,7 @@ public:
return PyUnicode_FromSQLWCHAR((const SQLWCHAR*)buffer, bytesUsed /
}

- if (PyString_CheckExact(bufferOwner))
+ if (bufferOwner != NULL && PyString_CheckExact(bufferOwner))
{
if (_PyString_Resize(&bufferOwner, bytesUsed) == -1)
return 0;
@@ -202,7 +202,7 @@ public:
return tmp;
}

- if (PyUnicode_CheckExact(bufferOwner))
+ if (bufferOwner != NULL && PyUnicode_CheckExact(bufferOwner))
{
if (PyUnicode_Resize(&bufferOwner, bytesUsed / element_size) == -1)
return 0;
Powered by Google Project Hosting