[Python-checkins] r68402 - in python/branches/release30-maint: Misc/NEWS Modules/_ctypes/callproc.c

[thomas.heller]

Author: thomas.heller
Date: Thu Jan  8 10:55:38 2009
New Revision: 68402

Log:

Merged revisions 68401 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r68401 | thomas.heller | 2009-01-08 10:34:20 +0100 (Do, 08 Jan 2009) | 2 lines
  
  Fixed a crash in ctypes, when HAVE_USABLE_WCHAR_T is false.
  Fixes issue #4867.
........


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Misc/NEWS
   python/branches/release30-maint/Modules/_ctypes/callproc.c

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Thu Jan  8 10:55:38 2009
@@ -70,6 +70,9 @@
 Library
 -------
 
+- Issue #4867: Fixed a crash in ctypes when passing a string to a
+  function without defining argtypes.
+
 - Restore Python 2.3 compatibility for decimal.py.
 
 - Issue #3638: Remove functions from _tkinter module level that depend on

Modified: python/branches/release30-maint/Modules/_ctypes/callproc.c
==============================================================================
--- python/branches/release30-maint/Modules/_ctypes/callproc.c	(original)
+++ python/branches/release30-maint/Modules/_ctypes/callproc.c	Thu Jan  8 10:55:38 2009
@@ -645,8 +645,8 @@
 
 #ifdef CTYPES_UNICODE
 	if (PyUnicode_Check(obj)) {
-#ifdef HAVE_USABLE_WCHAR_T
 		pa->ffi_type = &ffi_type_pointer;
+#ifdef HAVE_USABLE_WCHAR_T
 		pa->value.p = PyUnicode_AS_UNICODE(obj);
 		Py_INCREF(obj);
 		pa->keep = obj;