From: scottmk <scottmk@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 9 Mar 2010 04:53:52 +0000 (+0000)
Subject: Fix a NULL pointer problem that, under some circumstances, could segfault.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6b61c541a45a46d395340e255419da5f921713c7;p=contrib%2FConifer.git

Fix a NULL pointer problem that, under some circumstances, could segfault.

The get_primitive() function was returning NULL in some cases, and the calling
code didn't check for NULL.

Fix: return "string" as the default datatype.

M    Open-ILS/src/c-apps/oils_cstore.c


git-svn-id: svn://svn.open-ils.org/ILS/trunk@15751 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/src/c-apps/oils_cstore.c b/Open-ILS/src/c-apps/oils_cstore.c
index 6630b531fa..2177a0fe70 100644
--- a/Open-ILS/src/c-apps/oils_cstore.c
+++ b/Open-ILS/src/c-apps/oils_cstore.c
@@ -5979,8 +5979,7 @@ static const char* get_primitive( osrfHash* field ) {
 				MODULENAME,
 				osrfHashGet( field, "name" )
 			);
-		else
-			s = "string";
+		s = "string";
 	}
 	return s;
 }