From 524249c98e21f2beddad2eabf9cb2ee343c0c07b Mon Sep 17 00:00:00 2001 From: scottmk Date: Tue, 11 Aug 2009 13:47:32 +0000 Subject: [PATCH] Segfaulting for json_queries selecting from functions, due to a failure to handle the SELECT list properly. Fixed. git-svn-id: svn://svn.open-ils.org/ILS/trunk@13807 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/c-apps/oils_cstore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Open-ILS/src/c-apps/oils_cstore.c b/Open-ILS/src/c-apps/oils_cstore.c index 49abab6b77..5365c6adfc 100644 --- a/Open-ILS/src/c-apps/oils_cstore.c +++ b/Open-ILS/src/c-apps/oils_cstore.c @@ -2982,7 +2982,7 @@ char* SELECT ( jsonObject* defaultselhash = NULL; // if there is no select list, build a default select list ... - if (!selhash) { + if (!selhash && !from_function) { jsonObject* default_list = defaultSelectList( core_class ); if( ! default_list ) { if (ctx) { @@ -3003,7 +3003,7 @@ char* SELECT ( } // The SELECT clause can be encoded only by a hash - if( selhash->type != JSON_HASH ) { + if( !from_function && selhash->type != JSON_HASH ) { osrfLogError( OSRF_LOG_MARK, "%s: Expected JSON_HASH for SELECT clause; found %s", -- 2.11.0