Piet Delport patches: 1 of 3.

11 files changed, 19 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 6689175..9e5b2db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-23  Federico Di Gregorio  <fog@initd.org>
+
+	* Applied patch 1/3 from Piet Delport; from his email:
+           psycopg2-PyObject_HEAD.diff adds missing underscores to several
+           "PyObject_HEAD" declarations.  As far as i can tell from gdb, the 
+	   "PyObject HEAD" versions end up accidentally meaning almost exactly
+	   the same, but get aligned differently on AMD64, resulting in wrong
+	   size calculation and memory corruption later.
+
 2006-09-11  Federico Di Gregorio  <fog@initd.org>
 
 	* Fixed syntax error in lib/extras.py (see #123)
diff --git a/psycopg/adapter_asis.h b/psycopg/adapter_asis.h
index 9495c58..90353b7 100644
--- a/psycopg/adapter_asis.h
+++ b/psycopg/adapter_asis.h
@@ -31,7 +31,7 @@ extern "C" {
 extern PyTypeObject asisType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     /* this is the real object we wrap */
     PyObject *wrapped;
diff --git a/psycopg/adapter_binary.h b/psycopg/adapter_binary.h
index 262a72d..d95caa8 100644
--- a/psycopg/adapter_binary.h
+++ b/psycopg/adapter_binary.h
@@ -32,7 +32,7 @@ extern "C" {
 extern PyTypeObject binaryType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     PyObject *wrapped;
     PyObject *buffer;
diff --git a/psycopg/adapter_datetime.h b/psycopg/adapter_datetime.h
index a32bb8d..5c2e473 100644
--- a/psycopg/adapter_datetime.h
+++ b/psycopg/adapter_datetime.h
@@ -31,7 +31,7 @@ extern "C" {
 extern PyTypeObject pydatetimeType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     PyObject *wrapped;
     int       type;
diff --git a/psycopg/adapter_list.h b/psycopg/adapter_list.h
index 71b4286..e56764b 100644
--- a/psycopg/adapter_list.h
+++ b/psycopg/adapter_list.h
@@ -31,7 +31,7 @@ extern "C" {
 extern PyTypeObject listType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     PyObject *wrapped;
     PyObject *connection;
diff --git a/psycopg/adapter_mxdatetime.h b/psycopg/adapter_mxdatetime.h
index c485707..11e5cf8 100644
--- a/psycopg/adapter_mxdatetime.h
+++ b/psycopg/adapter_mxdatetime.h
@@ -31,7 +31,7 @@ extern "C" {
 extern PyTypeObject mxdatetimeType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     PyObject *wrapped;
     int       type;
diff --git a/psycopg/adapter_pboolean.h b/psycopg/adapter_pboolean.h
index efdfe56..392b047 100644
--- a/psycopg/adapter_pboolean.h
+++ b/psycopg/adapter_pboolean.h
@@ -31,7 +31,7 @@ extern "C" {
 extern PyTypeObject pbooleanType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     /* this is the real object we wrap */
     PyObject *wrapped;
diff --git a/psycopg/adapter_qstring.h b/psycopg/adapter_qstring.h
index 544b32b..516342f 100644
--- a/psycopg/adapter_qstring.h
+++ b/psycopg/adapter_qstring.h
@@ -31,7 +31,7 @@ extern "C" {
 extern PyTypeObject qstringType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     PyObject *wrapped;
     PyObject *buffer;
diff --git a/psycopg/connection.h b/psycopg/connection.h
index 7010120..d19006e 100644
--- a/psycopg/connection.h
+++ b/psycopg/connection.h
@@ -38,7 +38,7 @@ extern "C" {
 extern PyTypeObject connectionType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     pthread_mutex_t lock;   /* the global connection lock */
 
diff --git a/psycopg/cursor.h b/psycopg/cursor.h
index 5aab172..6ae88a2 100644
--- a/psycopg/cursor.h
+++ b/psycopg/cursor.h
@@ -34,7 +34,7 @@ extern "C" {
 extern PyTypeObject cursorType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     connectionObject *conn; /* connection owning the cursor */
 
diff --git a/psycopg/microprotocols_proto.h b/psycopg/microprotocols_proto.h
index c671264..d578b04 100644
--- a/psycopg/microprotocols_proto.h
+++ b/psycopg/microprotocols_proto.h
@@ -32,7 +32,7 @@ extern "C" {
 extern PyTypeObject isqlquoteType;
 
 typedef struct {
-    PyObject HEAD;
+    PyObject_HEAD;
 
     PyObject *wrapped;