ext: use RARRAY_CONST_PTR

nobu · nobu · commit 3553a86eb513 · 2015-11-04T07:27:10.000Z
* ext/bigdecimal/bigdecimal.c: use RARRAY_CONST_PTR just fore
  reference instead of RARRAY_PTR, to keep the array WB-protected.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52448 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
@@ -699,7 +699,7 @@ BigDecimal_to_i(VALUE self)
     }
     else {
 	VALUE a = BigDecimal_split(self);
-	VALUE digits = RARRAY_PTR(a)[1];
+	VALUE digits = RARRAY_CONST_PTR(a)[1];
 	VALUE numerator = rb_funcall(digits, rb_intern("to_i"), 0);
 	VALUE ret;
 	ssize_t dpower = e - (ssize_t)RSTRING_LEN(digits);
@@ -788,7 +788,7 @@ BigDecimal_to_r(VALUE self)
     sign = VpGetSign(p);
     power = VpExponent10(p);
     a = BigDecimal_split(self);
-    digits = RARRAY_PTR(a)[1];
+    digits = RARRAY_CONST_PTR(a)[1];
     denomi_power = power - RSTRING_LEN(digits);
     numerator = rb_funcall(digits, rb_intern("to_i"), 0);
 
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
@@ -3826,14 +3826,14 @@ rt_complete_frags(VALUE klass, VALUE hash)
 	for (i = 0; i < RARRAY_LEN(tab); i++) {
 	    VALUE x, a;
 
-	    x = RARRAY_PTR(tab)[i];
-	    a = RARRAY_PTR(x)[1];
+	    x = RARRAY_CONST_PTR(tab)[i];
+	    a = RARRAY_CONST_PTR(x)[1];
 
 	    {
 		long j, n = 0;
 
 		for (j = 0; j < RARRAY_LEN(a); j++)
-		    if (!NIL_P(ref_hash0(RARRAY_PTR(a)[j])))
+		    if (!NIL_P(ref_hash0(RARRAY_CONST_PTR(a)[j])))
 			n++;
 		if (n > eno) {
 		    eno = n;
@@ -3845,8 +3845,8 @@ rt_complete_frags(VALUE klass, VALUE hash)
 	    g = 0;
 	else {
 	    g = 1;
-	    k = RARRAY_PTR(RARRAY_PTR(tab)[idx])[0];
-	    a = RARRAY_PTR(RARRAY_PTR(tab)[idx])[1];
+	    k = RARRAY_CONST_PTR(RARRAY_CONST_PTR(tab)[idx])[0];
+	    a = RARRAY_CONST_PTR(RARRAY_CONST_PTR(tab)[idx])[1];
 	    e =	eno;
 	}
     }
@@ -3867,7 +3867,7 @@ rt_complete_frags(VALUE klass, VALUE hash)
 	    long i;
 
 	    for (i = 0; i < RARRAY_LEN(a); i++) {
-		VALUE e = RARRAY_PTR(a)[i];
+		VALUE e = RARRAY_CONST_PTR(a)[i];
 
 		if (!NIL_P(ref_hash0(e)))
 		    break;
@@ -3884,7 +3884,7 @@ rt_complete_frags(VALUE klass, VALUE hash)
 	    long i;
 
 	    for (i = 0; i < RARRAY_LEN(a); i++) {
-		VALUE e = RARRAY_PTR(a)[i];
+		VALUE e = RARRAY_CONST_PTR(a)[i];
 
 		if (!NIL_P(ref_hash0(e)))
 		    break;
@@ -3908,7 +3908,7 @@ rt_complete_frags(VALUE klass, VALUE hash)
 	    long i;
 
 	    for (i = 0; i < RARRAY_LEN(a); i++) {
-		VALUE e = RARRAY_PTR(a)[i];
+		VALUE e = RARRAY_CONST_PTR(a)[i];
 
 		if (!NIL_P(ref_hash0(e)))
 		    break;
@@ -3925,7 +3925,7 @@ rt_complete_frags(VALUE klass, VALUE hash)
 	    long i;
 
 	    for (i = 0; i < RARRAY_LEN(a); i++) {
-		VALUE e = RARRAY_PTR(a)[i];
+		VALUE e = RARRAY_CONST_PTR(a)[i];
 
 		if (!NIL_P(ref_hash0(e)))
 		    break;
@@ -7085,16 +7085,16 @@ d_lite_marshal_load(VALUE self, VALUE a)
 
 
 	    if  (RARRAY_LEN(a) == 2) {
-		ajd = f_sub(RARRAY_PTR(a)[0], half_days_in_day);
+		ajd = f_sub(RARRAY_CONST_PTR(a)[0], half_days_in_day);
 		of = INT2FIX(0);
-		sg = RARRAY_PTR(a)[1];
+		sg = RARRAY_CONST_PTR(a)[1];
 		if (!k_numeric_p(sg))
 		    sg = DBL2NUM(RTEST(sg) ? GREGORIAN : JULIAN);
 	    }
 	    else {
-		ajd = RARRAY_PTR(a)[0];
-		of = RARRAY_PTR(a)[1];
-		sg = RARRAY_PTR(a)[2];
+		ajd = RARRAY_CONST_PTR(a)[0];
+		of = RARRAY_CONST_PTR(a)[1];
+		sg = RARRAY_CONST_PTR(a)[2];
 	    }
 
 	    old_to_new(ajd, of, sg,
@@ -7119,12 +7119,12 @@ d_lite_marshal_load(VALUE self, VALUE a)
 	    int jd, df, of;
 	    double sg;
 
-	    nth = RARRAY_PTR(a)[0];
-	    jd = NUM2INT(RARRAY_PTR(a)[1]);
-	    df = NUM2INT(RARRAY_PTR(a)[2]);
-	    sf = RARRAY_PTR(a)[3];
-	    of = NUM2INT(RARRAY_PTR(a)[4]);
-	    sg = NUM2DBL(RARRAY_PTR(a)[5]);
+	    nth = RARRAY_CONST_PTR(a)[0];
+	    jd = NUM2INT(RARRAY_CONST_PTR(a)[1]);
+	    df = NUM2INT(RARRAY_CONST_PTR(a)[2]);
+	    sf = RARRAY_CONST_PTR(a)[3];
+	    of = NUM2INT(RARRAY_CONST_PTR(a)[4]);
+	    sg = NUM2DBL(RARRAY_CONST_PTR(a)[5]);
 	    if (!df && f_zero_p(sf) && !of) {
 		set_to_simple(self, &dat->s, nth, jd, sg, 0, 0, 0, HAVE_JD);
 	    } else {
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
@@ -528,7 +528,7 @@ fdbm_delete_if(VALUE obj)
     }
 
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	keystr = RARRAY_PTR(ary)[i];
+	keystr = RARRAY_CONST_PTR(ary)[i];
 	key.dptr = RSTRING_PTR(keystr);
 	key.dsize = (DSIZE_TYPE)RSTRING_LEN(keystr);
 	if (dbm_delete(dbm, key)) {
@@ -599,11 +599,13 @@ static VALUE fdbm_store(VALUE,VALUE,VALUE);
 static VALUE
 update_i(RB_BLOCK_CALL_FUNC_ARGLIST(pair, dbm))
 {
+    const VALUE *ptr;
     Check_Type(pair, T_ARRAY);
     if (RARRAY_LEN(pair) < 2) {
 	rb_raise(rb_eArgError, "pair must be [key, value]");
     }
-    fdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
+    ptr = RARRAY_CONST_PTR(pair);
+    fdbm_store(dbm, ptr[0], ptr[1]);
     return Qnil;
 }
 
diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
@@ -70,7 +70,7 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
     cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
 
     for (i = 0; i < argc; i++) {
-        type = NUM2INT(RARRAY_PTR(rbargs)[i]);
+        type = NUM2INT(RARRAY_CONST_PTR(rbargs)[i]);
         switch (type) {
 	  case TYPE_VOID:
 	    argc = 0;
@@ -123,7 +123,7 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
         }
     }
 
-    ret = rb_funcall2(self, rb_intern("call"), argc, RARRAY_PTR(params));
+    ret = rb_funcall2(self, rb_intern("call"), argc, RARRAY_CONST_PTR(params));
     RB_GC_GUARD(params);
 
     type = NUM2INT(ctype);
@@ -210,7 +210,7 @@ initialize(int rbargc, VALUE argv[], VALUE self)
     cl->argv = (ffi_type **)xcalloc(argc + 1, sizeof(ffi_type *));
 
     for (i = 0; i < argc; i++) {
-        int type = NUM2INT(RARRAY_PTR(args)[i]);
+        int type = NUM2INT(RARRAY_CONST_PTR(args)[i]);
         cl->argv[i] = INT2FFI_TYPE(type);
     }
     cl->argv[argc] = NULL;
diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c
@@ -110,7 +110,7 @@ initialize(int argc, VALUE argv[], VALUE self)
     arg_types = xcalloc(RARRAY_LEN(args) + 1, sizeof(ffi_type *));
 
     for (i = 0; i < RARRAY_LEN(args); i++) {
-	int type = NUM2INT(RARRAY_PTR(args)[i]);
+	int type = NUM2INT(RARRAY_CONST_PTR(args)[i]);
 	arg_types[i] = INT2FFI_TYPE(type);
     }
     arg_types[RARRAY_LEN(args)] = NULL;
@@ -164,7 +164,7 @@ function_call(int argc, VALUE argv[], VALUE self)
     values = (void **)((char *)generic_args + (size_t)argc * sizeof(fiddle_generic));
 
     for (i = 0; i < argc; i++) {
-	VALUE type = RARRAY_PTR(types)[i];
+	VALUE type = RARRAY_CONST_PTR(types)[i];
 	VALUE src = argv[i];
 
 	if(NUM2INT(type) == TYPE_VOIDP) {
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
@@ -634,7 +634,7 @@ fgdbm_delete_if(VALUE obj)
     }
 
     for (i = 0; i < RARRAY_LEN(ary); i++)
-        rb_gdbm_delete(obj, RARRAY_PTR(ary)[i]);
+        rb_gdbm_delete(obj, RARRAY_CONST_PTR(ary)[i]);
     if (status) rb_jump_tag(status);
     if (n > 0) dbmp->di_size = n - (int)RARRAY_LEN(ary);
     rb_ary_clear(ary);
@@ -747,11 +747,13 @@ fgdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
 static VALUE
 update_i(RB_BLOCK_CALL_FUNC_ARGLIST(pair, dbm))
 {
+    const VALUE *ptr;
     Check_Type(pair, T_ARRAY);
     if (RARRAY_LEN(pair) < 2) {
         rb_raise(rb_eArgError, "pair must be [key, value]");
     }
-    fgdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
+    ptr = RARRAY_CONST_PTR(pair);
+    fgdbm_store(dbm, ptr[0], ptr[1]);
     return Qnil;
 }
 
diff --git a/ext/io/console/console.c b/ext/io/console/console.c
@@ -521,12 +521,14 @@ console_set_winsize(VALUE io, VALUE size)
     int newrow, newcol;
 #endif
     VALUE row, col, xpixel, ypixel;
+    const VALUE *sz;
     int fd;
 
     GetOpenFile(io, fptr);
     size = rb_Array(size);
-    rb_scan_args((int)RARRAY_LEN(size), RARRAY_PTR(size), "22",
-                &row, &col, &xpixel, &ypixel);
+    rb_check_arity(RARRAY_LENINT(size), 2, 4);
+    sz = RARRAY_CONST_PTR(size);
+    row = sz[0], col = sz[1], xpixel = sz[2], ypixel = sz[3];
     fd = GetWriteFD(fptr);
 #if defined TIOCSWINSZ
     ws.ws_row = ws.ws_col = ws.ws_xpixel = ws.ws_ypixel = 0;
diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c
@@ -682,7 +682,7 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
 	/* All ary's members should be X509Extension */
 	Check_Type(ext, T_ARRAY);
 	for (i = 0; i < RARRAY_LEN(ext); i++)
-	    OSSL_Check_Kind(RARRAY_PTR(ext)[i], cX509Ext);
+	    OSSL_Check_Kind(RARRAY_CONST_PTR(ext)[i], cX509Ext);
     }
 
     error = 0;
@@ -711,7 +711,7 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
 	sk_X509_EXTENSION_pop_free(single->singleExtensions, X509_EXTENSION_free);
 	single->singleExtensions = NULL;
 	for(i = 0; i < RARRAY_LEN(ext); i++){
-	    x509ext = DupX509ExtPtr(RARRAY_PTR(ext)[i]);
+	    x509ext = DupX509ExtPtr(RARRAY_CONST_PTR(ext)[i]);
 	    if(!OCSP_SINGLERESP_add_ext(single, x509ext, -1)){
 		X509_EXTENSION_free(x509ext);
 		error = 1;
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
@@ -759,7 +759,7 @@ ossl_sslctx_setup(VALUE self)
     if(!NIL_P(val)){
 	if (RB_TYPE_P(val, T_ARRAY)) {
 	    for(i = 0; i < RARRAY_LEN(val); i++){
-		client_ca = GetX509CertPtr(RARRAY_PTR(val)[i]);
+		client_ca = GetX509CertPtr(RARRAY_CONST_PTR(val)[i]);
         	if (!SSL_CTX_add_client_CA(ctx, client_ca)){
 		    /* Copies X509_NAME => FREE it. */
         	    ossl_raise(eSSLError, "SSL_CTX_add_client_CA");
diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c
@@ -668,13 +668,13 @@ ossl_x509_set_extensions(VALUE self, VALUE ary)
     Check_Type(ary, T_ARRAY);
     /* All ary's members should be X509Extension */
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Ext);
+	OSSL_Check_Kind(RARRAY_CONST_PTR(ary)[i], cX509Ext);
     }
     GetX509(self, x509);
     sk_X509_EXTENSION_pop_free(x509->cert_info->extensions, X509_EXTENSION_free);
     x509->cert_info->extensions = NULL;
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	ext = DupX509ExtPtr(RARRAY_PTR(ary)[i]);
+	ext = DupX509ExtPtr(RARRAY_CONST_PTR(ary)[i]);
 
 	if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext - FREE it */
 	    X509_EXTENSION_free(ext);
diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
@@ -307,13 +307,13 @@ ossl_x509crl_set_revoked(VALUE self, VALUE ary)
     Check_Type(ary, T_ARRAY);
     /* All ary members should be X509 Revoked */
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Rev);
+	OSSL_Check_Kind(RARRAY_CONST_PTR(ary)[i], cX509Rev);
     }
     GetX509CRL(self, crl);
     sk_X509_REVOKED_pop_free(crl->crl->revoked, X509_REVOKED_free);
     crl->crl->revoked = NULL;
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	rev = DupX509RevokedPtr(RARRAY_PTR(ary)[i]);
+	rev = DupX509RevokedPtr(RARRAY_CONST_PTR(ary)[i]);
 	if (!X509_CRL_add0_revoked(crl, rev)) { /* NO DUP - don't free! */
 	    ossl_raise(eX509CRLError, NULL);
 	}
@@ -481,13 +481,13 @@ ossl_x509crl_set_extensions(VALUE self, VALUE ary)
     Check_Type(ary, T_ARRAY);
     /* All ary members should be X509 Extensions */
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Ext);
+	OSSL_Check_Kind(RARRAY_CONST_PTR(ary)[i], cX509Ext);
     }
     GetX509CRL(self, crl);
     sk_X509_EXTENSION_pop_free(crl->crl->extensions, X509_EXTENSION_free);
     crl->crl->extensions = NULL;
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	ext = DupX509ExtPtr(RARRAY_PTR(ary)[i]);
+	ext = DupX509ExtPtr(RARRAY_CONST_PTR(ary)[i]);
 	if(!X509_CRL_add_ext(crl, ext, -1)) { /* DUPs ext - FREE it */
 	    X509_EXTENSION_free(ext);
 	    ossl_raise(eX509CRLError, NULL);
diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c
@@ -423,13 +423,13 @@ ossl_x509req_set_attributes(VALUE self, VALUE ary)
 
     Check_Type(ary, T_ARRAY);
     for (i=0;i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Attr);
+	OSSL_Check_Kind(RARRAY_CONST_PTR(ary)[i], cX509Attr);
     }
     GetX509Req(self, req);
     sk_X509_ATTRIBUTE_pop_free(req->req_info->attributes, X509_ATTRIBUTE_free);
     req->req_info->attributes = NULL;
     for (i=0;i<RARRAY_LEN(ary); i++) {
-	item = RARRAY_PTR(ary)[i];
+	item = RARRAY_CONST_PTR(ary)[i];
 	attr = DupX509AttrPtr(item);
 	if (!X509_REQ_add1_attr(req, attr)) {
 	    ossl_raise(eX509ReqError, NULL);
diff --git a/ext/openssl/ossl_x509revoked.c b/ext/openssl/ossl_x509revoked.c
@@ -193,13 +193,13 @@ ossl_x509revoked_set_extensions(VALUE self, VALUE ary)
 
     Check_Type(ary, T_ARRAY);
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Ext);
+	OSSL_Check_Kind(RARRAY_CONST_PTR(ary)[i], cX509Ext);
     }
     GetX509Rev(self, rev);
     sk_X509_EXTENSION_pop_free(rev->extensions, X509_EXTENSION_free);
     rev->extensions = NULL;
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	item = RARRAY_PTR(ary)[i];
+	item = RARRAY_CONST_PTR(ary)[i];
 	ext = DupX509ExtPtr(item);
 	if(!X509_REVOKED_add_ext(rev, ext, -1)) {
 	    ossl_raise(eX509RevError, NULL);
diff --git a/ext/psych/psych_emitter.c b/ext/psych/psych_emitter.c
@@ -170,7 +170,7 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
 	tail  = head;
 
 	for(i = 0; i < RARRAY_LEN(tags); i++) {
-	    VALUE tuple = RARRAY_PTR(tags)[i];
+	    VALUE tuple = RARRAY_CONST_PTR(tags)[i];
 	    VALUE name;
 	    VALUE value;
 
@@ -180,8 +180,8 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
 		xfree(head);
 		rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
 	    }
-	    name  = RARRAY_PTR(tuple)[0];
-	    value = RARRAY_PTR(tuple)[1];
+	    name  = RARRAY_CONST_PTR(tuple)[0];
+	    value = RARRAY_CONST_PTR(tuple)[1];
 #ifdef HAVE_RUBY_ENCODING_H
 	    name = rb_str_export_to_enc(name, encoding);
 	    value = rb_str_export_to_enc(value, encoding);
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
@@ -963,7 +963,7 @@ readline_attempted_completion_function(const char *text, int start, int end)
     enc = rb_locale_encoding();
     encobj = rb_enc_from_encoding(enc);
     for (i = 0; i < matches; i++) {
-        temp = rb_obj_as_string(RARRAY_PTR(ary)[i]);
+        temp = rb_obj_as_string(RARRAY_CONST_PTR(ary)[i]);
         StringValueCStr(temp);  /* must be NUL-terminated */
         rb_enc_check(encobj, temp);
         result[i + 1] = (char*)malloc(RSTRING_LEN(temp) + 1);
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
@@ -530,7 +530,7 @@ fsdbm_delete_if(VALUE obj)
     }
 
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	keystr = RARRAY_PTR(ary)[i];
+	keystr = RARRAY_CONST_PTR(ary)[i];
 	ExportStringValue(keystr);
 	key.dptr = RSTRING_PTR(keystr);
 	key.dsize = RSTRING_LENINT(keystr);
@@ -655,11 +655,13 @@ fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
 static VALUE
 update_i(RB_BLOCK_CALL_FUNC_ARGLIST(pair, dbm))
 {
+    const VALUE *ptr;
     Check_Type(pair, T_ARRAY);
     if (RARRAY_LEN(pair) < 2) {
 	rb_raise(rb_eArgError, "pair must be [key, value]");
     }
-    fsdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
+    ptr = RARRAY_CONST_PTR(pair);
+    fsdbm_store(dbm, ptr[0], ptr[1]);
     return Qnil;
 }
 
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c

Original file line number	Diff line number	Diff line change
`@@ -528,7 +528,7 @@ fdbm_delete_if(VALUE obj)`
`528`	`528`	`}`
`529`	`529`
`530`	`530`	`for (i = 0; i < RARRAY_LEN(ary); i++) {`
`531`		`- keystr = RARRAY_PTR(ary)[i];`
	`531`	`+ keystr = RARRAY_CONST_PTR(ary)[i];`
`532`	`532`	`key.dptr = RSTRING_PTR(keystr);`
`533`	`533`	`key.dsize = (DSIZE_TYPE)RSTRING_LEN(keystr);`
`534`	`534`	`if (dbm_delete(dbm, key)) {`
`@@ -599,11 +599,13 @@ static VALUE fdbm_store(VALUE,VALUE,VALUE);`
`599`	`599`	`static VALUE`
`600`	`600`	`update_i(RB_BLOCK_CALL_FUNC_ARGLIST(pair, dbm))`
`601`	`601`	`{`
	`602`	`+ const VALUE *ptr;`
`602`	`603`	`Check_Type(pair, T_ARRAY);`
`603`	`604`	`if (RARRAY_LEN(pair) < 2) {`
`604`	`605`	`rb_raise(rb_eArgError, "pair must be [key, value]");`
`605`	`606`	`}`
`606`		`- fdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);`
	`607`	`+ ptr = RARRAY_CONST_PTR(pair);`
	`608`	`+ fdbm_store(dbm, ptr[0], ptr[1]);`
`607`	`609`	`return Qnil;`
`608`	`610`	`}`
`609`	`611`
Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,7 @@ fgdbm_delete_if(VALUE obj)`
`634`	`634`	`}`
`635`	`635`
`636`	`636`	`for (i = 0; i < RARRAY_LEN(ary); i++)`
`637`		`- rb_gdbm_delete(obj, RARRAY_PTR(ary)[i]);`
	`637`	`+ rb_gdbm_delete(obj, RARRAY_CONST_PTR(ary)[i]);`
`638`	`638`	`if (status) rb_jump_tag(status);`
`639`	`639`	`if (n > 0) dbmp->di_size = n - (int)RARRAY_LEN(ary);`
`640`	`640`	`rb_ary_clear(ary);`
`@@ -747,11 +747,13 @@ fgdbm_store(VALUE obj, VALUE keystr, VALUE valstr)`
`747`	`747`	`static VALUE`
`748`	`748`	`update_i(RB_BLOCK_CALL_FUNC_ARGLIST(pair, dbm))`
`749`	`749`	`{`
	`750`	`+ const VALUE *ptr;`
`750`	`751`	`Check_Type(pair, T_ARRAY);`
`751`	`752`	`if (RARRAY_LEN(pair) < 2) {`
`752`	`753`	`rb_raise(rb_eArgError, "pair must be [key, value]");`
`753`	`754`	`}`
`754`		`- fgdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);`
	`755`	`+ ptr = RARRAY_CONST_PTR(pair);`
	`756`	`+ fgdbm_store(dbm, ptr[0], ptr[1]);`
`755`	`757`	`return Qnil;`
`756`	`758`	`}`
`757`	`759`