diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2017-10-01 15:02:54 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2017-10-06 08:47:40 +0000 |
| commit | 7ca6ca4e96a93f9c23fc54320f5ff8e4ff044c8f (patch) | |
| tree | 05b351fb0ad0af1a44df8ebf43f8bcbb80f559fa /ext/dbm/dbm.c | |
| parent | 0ee8bb4c2a35d81dacf27be5fc42706aa891f33f (diff) | |
| download | ruby-7ca6ca4e96a93f9c23fc54320f5ff8e4ff044c8f.tar.gz | |
gdbm, dbm, sdbm: prevent possible leak in #initialize
Allocate struct dbmdata before opening a file in case of out of memory.
As a bonus, make ext/dbm and ext/sdbm close the currently open file if
any, as ext/gdbm is doing.
Diffstat (limited to 'ext/dbm/dbm.c')
| -rw-r--r-- | ext/dbm/dbm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c index fec06a0dac..1f69f68a5a 100644 --- a/ext/dbm/dbm.c +++ b/ext/dbm/dbm.c @@ -47,7 +47,6 @@ closed_dbm(void) #define GetDBM(obj, dbmp) do {\ TypedData_Get_Struct((obj), struct dbmdata, &dbm_type, (dbmp));\ - if ((dbmp) == 0) closed_dbm();\ if ((dbmp)->di_dbm == 0) closed_dbm();\ } while (0) @@ -115,8 +114,6 @@ fdbm_closed(VALUE obj) struct dbmdata *dbmp; TypedData_Get_Struct(obj, struct dbmdata, &dbm_type, dbmp); - if (dbmp == 0) - return Qtrue; if (dbmp->di_dbm == 0) return Qtrue; @@ -126,7 +123,9 @@ fdbm_closed(VALUE obj) static VALUE fdbm_alloc(VALUE klass) { - return TypedData_Wrap_Struct(klass, &dbm_type, 0); + struct dbmdata *dbmp; + + return TypedData_Make_Struct(klass, struct dbmdata, &dbm_type, dbmp); } /* @@ -150,6 +149,7 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj) struct dbmdata *dbmp; int mode, flags = 0; + TypedData_Get_Struct(obj, struct dbmdata, &dbm_type, dbmp); if (rb_scan_args(argc, argv, "12", &file, &vmode, &vflags) == 1) { mode = 0666; /* default value */ } @@ -228,8 +228,8 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj) rb_sys_fail_str(file); } - dbmp = ALLOC(struct dbmdata); - DATA_PTR(obj) = dbmp; + if (dbmp->di_dbm) + dbm_close(dbmp->di_dbm); dbmp->di_dbm = dbm; dbmp->di_size = -1; |