[Groonga-commit] groonga/groonga at 4bbdbbe [master] normalize:fix a crash bug when object is not normalizer

Back to archive index

naoa null+****@clear*****
Thu Jun 5 17:42:55 JST 2014


naoa	2014-06-05 17:42:55 +0900 (Thu, 05 Jun 2014)

  New Revision: 4bbdbbe3334a2af20b6483e91ff9ee96e92f48c0
  https://github.com/groonga/groonga/commit/4bbdbbe3334a2af20b6483e91ff9ee96e92f48c0

  Merged 1a2b3a4: Merge pull request #174 from naoa/fix-normalize-object-check

  Message:
    normalize:fix a crash bug when object is not normalizer

  Modified files:
    lib/proc.c

  Modified: lib/proc.c (+3 -1)
===================================================================
--- lib/proc.c    2014-06-05 12:10:32 +0900 (6189d9d)
+++ lib/proc.c    2014-06-05 17:42:55 +0900 (e51be05)
@@ -3006,7 +3006,9 @@ proc_normalize(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data
     normalizer = grn_ctx_get(ctx,
                              GRN_TEXT_VALUE(normalizer_name),
                              GRN_TEXT_LEN(normalizer_name));
-    if (!normalizer) {
+    if (!normalizer ||
+        normalizer->header.type != GRN_PROC ||
+        grn_proc_get_type(ctx, normalizer) != GRN_PROC_NORMALIZER) {
       ERR(GRN_INVALID_ARGUMENT,
           "unknown normalizer: <%.*s>",
           (int)GRN_TEXT_LEN(normalizer_name),
-------------- next part --------------
HTML����������������������������...
Télécharger 



More information about the Groonga-commit mailing list
Back to archive index