[Groonga-commit] groonga/grngo at ff4a944 [master] Fix a bug that FindColumn() finds a non-existent _key column.

Back to archive index

susumu.yata null+****@clear*****
Wed Jul 29 23:26:14 JST 2015


susumu.yata	2015-07-29 23:26:14 +0900 (Wed, 29 Jul 2015)

  New Revision: ff4a944c2f8afe4f6f87d7a124f22fb4004539ac
  https://github.com/groonga/grngo/commit/ff4a944c2f8afe4f6f87d7a124f22fb4004539ac

  Message:
    Fix a bug that FindColumn() finds a non-existent _key column.
    
    GitHub: #20

  Modified files:
    grngo.c

  Modified: grngo.c (+5 -0)
===================================================================
--- grngo.c    2015-07-29 22:17:03 +0900 (d7233bf)
+++ grngo.c    2015-07-29 23:26:14 +0900 (65396a2)
@@ -534,6 +534,11 @@ static grn_rc
 _grngo_open_src(grngo_db *db, grn_obj *table,
                 const char *name, size_t name_len, grn_obj **src) {
   grn_obj *new_src;
+  if ((name_len == GRN_COLUMN_NAME_KEY_LEN) &&
+      !memcmp(name, GRN_COLUMN_NAME_KEY, name_len) &&
+      (table->header.type == GRN_TABLE_NO_KEY)) {
+    return GRN_INVALID_ARGUMENT;
+  }
   if ((name_len == GRN_COLUMN_NAME_VALUE_LEN) &&
       !memcmp(name, GRN_COLUMN_NAME_VALUE, name_len)) {
     new_src = grn_ctx_at(db->ctx, grn_obj_id(db->ctx, table));
-------------- next part --------------
HTML����������������������������...
下載 



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