PL/Python: Fix type mixup

petere · petere · commit fa2fc066f34f · 2013-06-13T21:42:42.000-04:00
Memory was allocated based on the sizeof a type that was not the type of
the pointer that the result was being assigned to.  The types happen to
be of the same size, but it's still wrong.
diff --git a/src/pl/plpython/plpy_typeio.c b/src/pl/plpython/plpy_typeio.c
@@ -200,7 +200,7 @@ PLy_output_tuple_funcs(PLyTypeInfo *arg, TupleDesc desc)
 		if (arg->out.r.atts)
 			PLy_free(arg->out.r.atts);
 		arg->out.r.natts = desc->natts;
-		arg->out.r.atts = PLy_malloc0(desc->natts * sizeof(PLyDatumToOb));
+		arg->out.r.atts = PLy_malloc0(desc->natts * sizeof(PLyObToDatum));
 	}
 
 	Assert(OidIsValid(desc->tdtypeid));

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ PLy_output_tuple_funcs(PLyTypeInfo *arg, TupleDesc desc)`
`200`	`200`	`if (arg->out.r.atts)`
`201`	`201`	`PLy_free(arg->out.r.atts);`
`202`	`202`	`arg->out.r.natts = desc->natts;`
`203`		`- arg->out.r.atts = PLy_malloc0(desc->natts * sizeof(PLyDatumToOb));`
	`203`	`+ arg->out.r.atts = PLy_malloc0(desc->natts * sizeof(PLyObToDatum));`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`Assert(OidIsValid(desc->tdtypeid));`