diff -up ./src/cpp/flann/util/allocator.h.noexit ./src/cpp/flann/util/allocator.h
--- ./src/cpp/flann/util/allocator.h.noexit	2011-01-31 18:33:14.772634001 -0500
+++ ./src/cpp/flann/util/allocator.h	2011-01-31 18:33:37.578634001 -0500
@@ -145,7 +145,7 @@ public:
 			void* m = ::malloc(blocksize);
 			if (!m) {
                 fprintf(stderr,"Failed to allocate memory.\n");
-                exit(1);
+                return NULL;
 			}
 
 			/* Fill first word of new block with pointer to previous block. */