Kouhei Sutou
null+****@clear*****
Thu May 19 18:04:45 JST 2016
Kouhei Sutou 2016-05-19 18:04:45 +0900 (Thu, 19 May 2016) New Revision: 82d09082feb995b49313dd3d9a2fa07ee11fc22c https://github.com/groonga/groonga/commit/82d09082feb995b49313dd3d9a2fa07ee11fc22c Message: grn_proc_option_value_*: accept NULL as value Modified files: lib/proc.c Modified: lib/proc.c (+15 -0) =================================================================== --- lib/proc.c 2016-05-19 10:53:43 +0900 (b4d2546) +++ lib/proc.c 2016-05-19 18:04:45 +0900 (ad077df) @@ -1277,6 +1277,10 @@ grn_proc_option_value_bool(grn_ctx *ctx, const char *value; size_t value_length; + if (!option) { + return default_value; + } + value = GRN_TEXT_VALUE(option); value_length = GRN_TEXT_LEN(option); @@ -1305,6 +1309,10 @@ grn_proc_option_value_int32(grn_ctx *ctx, int32_t int32_value; const char *rest; + if (!option) { + return default_value; + } + value = GRN_TEXT_VALUE(option); value_length = GRN_TEXT_LEN(option); @@ -1328,6 +1336,13 @@ grn_proc_option_value_string(grn_ctx *ctx, const char *value; size_t value_length; + if (!option) { + if (size) { + *size = 0; + } + return NULL; + } + value = GRN_TEXT_VALUE(option); value_length = GRN_TEXT_LEN(option); -------------- next part -------------- HTML����������������������������...Download