summaryrefslogtreecommitdiff
path: root/databases/ruby-bdb/files/patch-src-common.c
diff options
context:
space:
mode:
Diffstat (limited to 'databases/ruby-bdb/files/patch-src-common.c')
-rw-r--r--databases/ruby-bdb/files/patch-src-common.c163
1 files changed, 154 insertions, 9 deletions
diff --git a/databases/ruby-bdb/files/patch-src-common.c b/databases/ruby-bdb/files/patch-src-common.c
index 729ff77f1cd5..ba1783425a39 100644
--- a/databases/ruby-bdb/files/patch-src-common.c
+++ b/databases/ruby-bdb/files/patch-src-common.c
@@ -1,6 +1,18 @@
--- src/common.c.orig 2011-04-06 19:35:39 UTC
+++ src/common.c
-@@ -1229,7 +1229,7 @@ bdb_s_new(int argc, VALUE *argv, VALUE o
+@@ -1080,9 +1080,11 @@ bdb_close(int argc, VALUE *argv, VALUE obj)
+ bdb_DB *dbst;
+ int flags = 0;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4) {
+ rb_raise(rb_eSecurityError, "Insecure: can't close the database");
+ }
++#endif
+ Data_Get_Struct(obj, bdb_DB, dbst);
+ if (dbst->dbp != NULL) {
+ if (rb_scan_args(argc, argv, "01", &opt)) {
+@@ -1229,7 +1231,7 @@ bdb_s_new(int argc, VALUE *argv, VALUE obj)
if (argc && TYPE(argv[argc - 1]) == T_HASH) {
VALUE v, f = argv[argc - 1];
@@ -9,7 +21,7 @@
if (!rb_obj_is_kind_of(v, bdb_cTxn)) {
rb_raise(bdb_eFatal, "argument of txn must be a transaction");
}
-@@ -1241,7 +1241,7 @@ bdb_s_new(int argc, VALUE *argv, VALUE o
+@@ -1241,7 +1243,7 @@ bdb_s_new(int argc, VALUE *argv, VALUE obj)
dbst->options |= envst->options & BDB_NO_THREAD;
dbst->marshal = txnst->marshal;
}
@@ -18,7 +30,7 @@
if (!rb_obj_is_kind_of(v, bdb_cEnv)) {
rb_raise(bdb_eFatal, "argument of env must be an environnement");
}
-@@ -1254,11 +1254,11 @@ bdb_s_new(int argc, VALUE *argv, VALUE o
+@@ -1254,11 +1256,11 @@ bdb_s_new(int argc, VALUE *argv, VALUE obj)
#if HAVE_CONST_DB_ENCRYPT
if (envst && (envst->options & BDB_ENV_ENCRYPT)) {
VALUE tmp = rb_str_new2("set_flags");
@@ -32,7 +44,27 @@
rb_hash_aset(f, tmp, INT2NUM(NUM2INT(v) | DB_ENCRYPT));
}
else {
-@@ -1570,10 +1570,10 @@ bdb_init(int argc, VALUE *argv, VALUE ob
+@@ -1431,15 +1433,19 @@ bdb_init(int argc, VALUE *argv, VALUE obj)
+ dbst->options |= BDB_FEEDBACK;
+ }
+ #endif
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
+ if (flags & DB_TRUNCATE) {
+ rb_secure(2);
+ }
++#endif
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ if (flags & DB_CREATE) {
+ rb_secure(4);
+ }
+ if (rb_safe_level() >= 4) {
+ flags |= DB_RDONLY;
+ }
++#endif
+ #if HAVE_CONST_DB_DUPSORT
+ if (dbst->options & BDB_DUP_COMPARE) {
+ #if HAVE_TYPE_DB_INFO
+@@ -1570,10 +1576,10 @@ bdb_init(int argc, VALUE *argv, VALUE obj)
#endif
switch(dbst->type) {
case DB_BTREE:
@@ -45,7 +77,7 @@
break;
case DB_RECNO:
{
-@@ -1581,17 +1581,17 @@ bdb_init(int argc, VALUE *argv, VALUE ob
+@@ -1581,17 +1587,17 @@ bdb_init(int argc, VALUE *argv, VALUE obj)
rb_warning("It's hard to distinguish Recnum with Recno for all versions of Berkeley DB");
if ((count = bdb_is_recnum(dbst->dbp)) != -1) {
@@ -66,7 +98,7 @@
break;
#endif
default:
-@@ -1635,29 +1635,29 @@ bdb_s_alloc(obj)
+@@ -1635,29 +1641,29 @@ bdb_s_alloc(obj)
dbst->options = BDB_NOT_OPEN;
cl = obj;
while (cl) {
@@ -102,7 +134,47 @@
dbst->type = DB_UNKNOWN;
break;
}
-@@ -3004,8 +3004,8 @@ bdb_each_kvc(argc, argv, obj, sens, repl
+@@ -1802,7 +1808,9 @@ bdb_append_internal(argc, argv, obj, flag, retval)
+ VALUE *a, ary = Qnil;
+ volatile VALUE res = Qnil;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ rb_secure(4);
++#endif
+ if (argc < 1)
+ return obj;
+ INIT_TXN(txnid, obj, dbst);
+@@ -1885,7 +1893,9 @@ bdb_put(int argc, VALUE *argv, VALUE obj)
+ int ret, flags;
+ db_recno_t recno;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ rb_secure(4);
++#endif
+ INIT_TXN(txnid, obj, dbst);
+ flags = 0;
+ a = b = c = Qnil;
+@@ -2374,7 +2384,9 @@ bdb_consume(obj)
+ int ret;
+ db_recno_t recno;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ rb_secure(4);
++#endif
+ INIT_TXN(txnid, obj, dbst);
+ MEMZERO(&key, DBT, 1);
+ MEMZERO(&data, DBT, 1);
+@@ -2551,7 +2563,9 @@ bdb_del(obj, a)
+ db_recno_t recno;
+ volatile VALUE b = Qnil;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ rb_secure(4);
++#endif
+ INIT_TXN(txnid, obj, dbst);
+ #if HAVE_CONST_DB_AUTO_COMMIT
+ if (txnid == NULL && (dbst->options & BDB_AUTO_COMMIT)) {
+@@ -3004,8 +3018,8 @@ bdb_each_kvc(argc, argv, obj, sens, replace, type)
if (argc && TYPE(argv[argc - 1]) == T_HASH) {
VALUE g, f = argv[argc - 1];
@@ -113,7 +185,29 @@
flags = NUM2INT(g);
}
argc--;
-@@ -3323,8 +3323,8 @@ bdb_clear(int argc, VALUE *argv, VALUE o
+@@ -3053,9 +3067,11 @@ bdb_each_kvc(argc, argv, obj, sens, replace, type)
+ }
+ #endif
+ type &= ~BDB_ST_ONE;
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ if ((type & ~BDB_ST_PREFIX) == BDB_ST_DELETE) {
+ rb_secure(4);
+ }
++#endif
+ INIT_TXN(txnid, obj, dbst);
+ #if HAVE_DB_CURSOR_4
+ bdb_test_error(dbst->dbp->cursor(dbst->dbp, txnid, &dbcp, flags));
+@@ -3309,7 +3325,9 @@ bdb_clear(int argc, VALUE *argv, VALUE obj)
+ #endif
+ int flags = 0;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ rb_secure(4);
++#endif
+ #if HAVE_ST_DB_TRUNCATE
+ INIT_TXN(txnid, obj, dbst);
+ #if HAVE_CONST_DB_AUTO_COMMIT
+@@ -3323,8 +3341,8 @@ bdb_clear(int argc, VALUE *argv, VALUE obj)
flags = 0;
if (argc && TYPE(argv[argc - 1]) == T_HASH) {
VALUE g, f = argv[argc - 1];
@@ -124,7 +218,7 @@
flags = NUM2INT(g);
}
argc--;
-@@ -3348,8 +3348,8 @@ bdb_replace(int argc, VALUE *argv, VALUE
+@@ -3348,8 +3366,8 @@ bdb_replace(int argc, VALUE *argv, VALUE obj)
flags = 0;
if (TYPE(argv[argc - 1]) == T_HASH) {
VALUE f = argv[argc - 1];
@@ -135,3 +229,54 @@
flags = NUM2INT(g);
}
argc--;
+@@ -3557,8 +3575,10 @@ bdb_sync(obj)
+ {
+ bdb_DB *dbst;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)
+ rb_raise(rb_eSecurityError, "Insecure: can't sync the database");
++#endif
+ GetDB(obj, dbst);
+ bdb_test_error(dbst->dbp->sync(dbst->dbp, 0));
+ return Qtrue;
+@@ -3884,7 +3904,9 @@ bdb_s_upgrade(int argc, VALUE *argv, VALUE obj)
+ int flags;
+ VALUE val;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ rb_secure(4);
++#endif
+ flags = 0;
+ if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
+ flags = NUM2INT(b);
+@@ -3908,7 +3930,9 @@ bdb_s_remove(int argc, VALUE *argv, VALUE obj)
+ VALUE a, b, c;
+ char *name, *subname;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
+ rb_secure(2);
++#endif
+ c = bdb_i_create(obj);
+ GetDB(c, dbst);
+ name = subname = NULL;
+@@ -3936,7 +3960,9 @@ bdb_s_rename(int argc, VALUE *argv, VALUE obj)
+ VALUE a, b, c;
+ char *name, *subname, *newname;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
+ rb_secure(2);
++#endif
+ c = bdb_i_create(obj);
+ GetDB(c, dbst);
+ name = subname = NULL;
+@@ -4222,7 +4248,9 @@ bdb_verify(int argc, VALUE *argv, VALUE obj)
+ #endif
+ FILE *io = NULL;
+
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+ rb_secure(4);
++#endif
+ file = database = NULL;
+ switch(rb_scan_args(argc, argv, "02", &iov, &flagv)) {
+ case 2:
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-09 09:57:38 +0000