Quick bugfix to errno after malloc success problem.

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1302 4e78687f-474d-0410-85f9-8d5e500ac6b2

1 files changed, 13 insertions, 1 deletions

diff --git a/src/pj_malloc.c b/src/pj_malloc.c
index 6beb502a..a1dd162c 100644
--- a/src/pj_malloc.c
+++ b/src/pj_malloc.c
@@ -6,9 +6,21 @@ static const char SCCSID[]="@(#)pj_malloc.c	4.3   93/06/12 GIE REL";
 ** projection system memory allocation/deallocation call with custom
 ** application procedures.  */
 #include <projects.h>
+#include <errno.h>
+
 	void *
 pj_malloc(size_t size) {
-	return(malloc(size));
+// Currently, pj_malloc is a hack to solve an errno problem.
+// The problem is described in more details at 
+// https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=86420. 
+// It seems, that pj_init and similar functions incorrectly 
+// (under debian/glibs-2.3.2) assume that pj_malloc resets 
+// errno after success. pj_malloc tries to mimic this.
+        int old_errno = errno;
+        void *res = malloc(size);       
+        if ( res && !old_errno )
+                errno = 0;        	 
+        return res;
 }
 	void
 pj_dalloc(void *ptr) {