Merge lp:~ai-2/ijson/more-ptr-trunc into lp:~isagalaev/ijson/trunk

[a]

return pointer truncation issue for yajl.get_error (ctype.c_void_p is int?).

added a threading test case that seem to triggers this problem.

all test cases pass w/ fedora 13 x86_64, python 2.6

[Ivan Sagalaev (isagalaev)]

> --- ijson/lib.py 2010-12-03 13:48:18 +0000
> +++ ijson/lib.py 2010-12-04 11:51:13 +0000
>
> @@ -7,7 +7,7 @@
>
> if name is None:
> import os
> hardy64_name = '/usr/lib/libyajl.so.1'
> - os.path.exists(hardy64_name):
> + if os.path.exists(hardy64_name):
> name = hardy64_name

Doh... Sorry for this, I was in a hurry :-(

Thanks for the fix!

=== modified file 'ijson/lib.py'
--- ijson/lib.py	2010-12-03 13:48:18 +0000
+++ ijson/lib.py	2010-12-04 11:51:13 +0000
@@ -7,7 +7,7 @@
 if name is None:
     import os
     hardy64_name = '/usr/lib/libyajl.so.1'
-    os.path.exists(hardy64_name):
+    if os.path.exists(hardy64_name):
         name = hardy64_name
 
 if name is None:
@@ -17,3 +17,4 @@
 yajl.yajl_alloc.restype = POINTER(c_char)
 yajl.yajl_gen_alloc.restype = POINTER(c_char)
 yajl.yajl_gen_alloc2.restype = POINTER(c_char)
+yajl.yajl_get_error.restype = POINTER(c_char)

=== modified file 'ijson/parse.py'
--- ijson/parse.py	2010-09-28 19:29:37 +0000
+++ ijson/parse.py	2010-12-04 11:51:13 +0000
@@ -1,5 +1,5 @@
 from ctypes import Structure, c_uint, c_ubyte, c_int, c_long, c_double, \
-                   c_void_p, c_char_p, CFUNCTYPE, POINTER, byref, string_at
+                   c_void_p, c_char_p, CFUNCTYPE, POINTER, byref, string_at, cast
 from decimal import Decimal
 
 from ijson.lib import yajl
@@ -94,7 +94,6 @@
             return 1
         return func_type(c_callback)
 
-    yajl.yajl_get_error.restype = c_void_p
     callbacks = Callbacks(*[callback(*data) for data in _callback_data])
     config = Config(allow_comments, check_utf8)
     handle = yajl.yajl_alloc(byref(callbacks), byref(config), None, None)
@@ -107,7 +106,7 @@
                 result = yajl.yajl_parse_complete(handle)
             if result == YAJL_ERROR:
                 perror = yajl.yajl_get_error(handle, 1, buffer, len(buffer))
-                error = c_char_p(perror).value
+                error = cast(perror, c_char_p).value
                 yajl.yajl_free_error(handle, perror)
                 raise JSONError(error)
             if not buffer and not events:

=== modified file 'tests.py'
--- tests.py	2010-09-28 09:30:05 +0000
+++ tests.py	2010-12-04 11:51:13 +0000
@@ -2,6 +2,7 @@
 import unittest
 from cStringIO import StringIO
 from decimal import Decimal
+import threading
 
 from ijson import parse, basic_parse, JSONError, IncompleteJSONError, ObjectBuilder, items
 
@@ -162,7 +163,50 @@
             {'key': 'value'},
             None,
         ])
-
+        
+class FuncThread(threading.Thread):
+    def __init__(self, func):
+        super(FuncThread, self).__init__()
+        self.func = func
+        
+    def run(self):
+        self.func()
+
+class ParseThreaded(Parse):
+    def test_basic_parse(self):
+        t = FuncThread(super(ParseThreaded, self).test_basic_parse)
+        t.start()
+        t.join()
+
+    def test_parse(self):
+        t = FuncThread(super(ParseThreaded, self).test_parse)
+        t.start()
+        t.join()
+
+    def test_scalar(self):
+        t = FuncThread(super(ParseThreaded, self).test_scalar)
+        t.start()
+        t.join()
+
+    def test_empty(self):
+        t = FuncThread(super(ParseThreaded, self).test_empty)
+        t.start()
+        t.join()
+
+    def test_incomplete(self):
+        t = FuncThread(super(ParseThreaded, self).test_incomplete)
+        t.start()
+        t.join()
+
+    def test_invalid(self):
+        t = FuncThread(super(ParseThreaded, self).test_invalid)
+        t.start()
+        t.join()
+
+    def test_lazy(self):
+        t = FuncThread(super(ParseThreaded, self).test_lazy)
+        t.start()
+        t.join()
 
 if __name__ == '__main__':
     unittest.main()