[ruby-dev:13095] Re: patch for ext/gdbm

新井です。

パッチの小だしばかりして大変申し訳ないのですが・・・

GDBM#indexes が存在しないキーに対してゴミを返すようです。

  def test_indexes
    keys = %w(foo bar baz)
    values = %w(FOO BAR BAZ)
    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values

    assert_equals(values.reverse, @gdbm.indexes(*keys.reverse))
    assert_equals([nil], @gdbm.indexes("foobarbaz"))
  end

  =>TestGDBM#test_indexes F.
    Time: 0.043805
    FAILURES!!!
    Test Results:
     Run: 1/1(6 asserts) Failures: 1 Errors: 0
    Failures: 1
    testgdbm.rb:287:in `test_indexes'(TestGDBM): expected:<[nil]> but was:<[0]> (RUNIT::AssertionFailedError)
	    from testgdbm.rb:638


Index: ext/gdbm/gdbm.c
===================================================================
RCS file: /src/ruby/ext/gdbm/gdbm.c,v
retrieving revision 1.15
diff -u -p -u -r1.15 gdbm.c
--- ext/gdbm/gdbm.c	2001/05/02 04:22:18	1.15
+++ ext/gdbm/gdbm.c	2001/05/03 08:24:52
@@ -185,6 +185,18 @@ rb_gdbm_fetch2(dbm, keystr)
 }
 
 static VALUE
+rb_gdbm_fetch3(obj, keystr)
+    VALUE obj, keystr;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+    return rb_gdbm_fetch2(dbm, keystr);
+}
+
+static VALUE
 rb_gdbm_firstkey(dbm)
     GDBM_FILE dbm;
 {
@@ -235,21 +247,12 @@ static VALUE
 fgdbm_fetch(obj, keystr, ifnone)
     VALUE obj, keystr, ifnone;
 {
-    datum key;
-    struct dbmdata *dbmp;
-    GDBM_FILE dbm;
     VALUE valstr;
 
-    StringValue(keystr);
-    key.dptr = RSTRING(keystr)->ptr;
-    key.dsize = RSTRING(keystr)->len;
-
-    GetDBM(obj, dbmp);
-    dbm = dbmp->di_dbm;
-    valstr = rb_gdbm_fetch(dbm, key);
+    valstr = rb_gdbm_fetch3(obj, keystr);
     if (NIL_P(valstr)) {
 	if (ifnone == Qnil && rb_block_given_p())
-	    return rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
+	    return rb_yield(keystr);
 	return ifnone;
     }
     return valstr;
@@ -259,7 +262,7 @@ static VALUE
 fgdbm_aref(obj, keystr)
     VALUE obj, keystr;
 {
-    return fgdbm_fetch(obj, keystr, Qnil);
+    return rb_gdbm_fetch3(obj, keystr);
 }
 
 static VALUE
@@ -314,7 +317,7 @@ fgdbm_indexes(argc, argv, obj)
 
     new = rb_ary_new2(argc);
     for (i=0; i<argc; i++) {
-	rb_ary_push(new, fgdbm_fetch(obj, argv[i]));
+	rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
     }
 
     return new;

--
新井康司 (Koji Arai)