Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.0.X] Fixed #9747 -- now explicitly set response type on C function…

…s that return WKB and WKT.

Backport of r9605 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 974135fc7e11c69badce74dc8108c9534a39c4c6 1 parent 4dcff3e
@jbronn jbronn authored
Showing with 16 additions and 1 deletion.
  1. +16 −1 django/contrib/gis/geos/prototypes/geom.py
View
17 django/contrib/gis/geos/prototypes/geom.py
@@ -1,8 +1,21 @@
-from ctypes import c_char_p, c_int, c_size_t, c_uint, POINTER
+from ctypes import c_char_p, c_int, c_size_t, c_ubyte, c_uint, POINTER
from django.contrib.gis.geos.libgeos import lgeos, CS_PTR, GEOM_PTR
from django.contrib.gis.geos.prototypes.errcheck import \
check_geom, check_minus_one, check_sized_string, check_string, check_zero
+# This is the return type used by binary output (WKB, HEX) routines.
+c_uchar_p = POINTER(c_ubyte)
+
+# We create a simple subclass of c_char_p here because when the response
+# type is set to c_char_p, you get a _Python_ string and there's no way
+# to access the string's address inside the error checking function.
+# In other words, you can't free the memory allocated inside GEOS. Previously,
+# the return type would just be omitted and the integer address would be
+# used -- but this allows us to be specific in the function definition and
+# keeps the reference so it may be free'd.
+class geos_char_p(c_char_p):
+ pass
+
### ctypes generation functions ###
def bin_constructor(func):
"Generates a prototype for binary construction (HEX, WKB) GEOS routines."
@@ -16,6 +29,7 @@ def bin_output(func):
"Generates a prototype for the routines that return a a sized string."
func.argtypes = [GEOM_PTR, POINTER(c_size_t)]
func.errcheck = check_sized_string
+ func.restype = c_uchar_p
return func
def geom_output(func, argtypes):
@@ -44,6 +58,7 @@ def string_from_geom(func):
# We do _not_ specify an argument type because we want just an
# address returned from the function.
func.argtypes = [GEOM_PTR]
+ func.restype = geos_char_p
func.errcheck = check_string
return func
Please sign in to comment.
Something went wrong with that request. Please try again.