Kouhei Sutou
null+****@clear*****
Fri May 20 09:50:10 JST 2016
Kouhei Sutou 2016-05-20 09:50:10 +0900 (Fri, 20 May 2016) New Revision: 2be83cda5288a99c9196c1cc55eecd8202d907b3 https://github.com/groonga/groonga/commit/2be83cda5288a99c9196c1cc55eecd8202d907b3 Message: select: add missing error check Modified files: lib/proc/proc_select.c Modified: lib/proc/proc_select.c (+11 -8) =================================================================== --- lib/proc/proc_select.c 2016-05-20 09:41:56 +0900 (e1fc4b0) +++ lib/proc/proc_select.c 2016-05-20 09:50:10 +0900 (8df79bb) @@ -2466,6 +2466,7 @@ grn_select_data_fill_drilldowns(grn_ctx *ctx, "drilldown_filter", -1), NULL); } else { + grn_bool succeeded = GRN_TRUE; unsigned int i; if (!grn_select_data_fill_drilldown_labels(ctx, user_data, data)) { @@ -2495,12 +2496,14 @@ grn_select_data_fill_drilldowns(grn_ctx *ctx, (int)(drilldown->label.length), drilldown->label.value); - /* TODO: Check return value. */ - grn_columns_fill(ctx, - user_data, - &(drilldown->columns), - drilldown_label, - strlen(drilldown_label)); + succeeded = grn_columns_fill(ctx, + user_data, + &(drilldown->columns), + drilldown_label, + strlen(drilldown_label)); + if (!succeeded) { + break; + } #define GET_VAR(name) \ grn_snprintf(key_name, \ @@ -2539,9 +2542,9 @@ grn_select_data_fill_drilldowns(grn_ctx *ctx, table); i++; } GRN_HASH_EACH_END(ctx, cursor); - } - return GRN_TRUE; + return succeeded; + } } static grn_obj * -------------- next part -------------- HTML����������������������������...ダウンロード
