diff options
| -rw-r--r-- | dir.c | 6 | ||||
| -rw-r--r-- | util.c | 8 |
2 files changed, 14 insertions, 0 deletions
@@ -1054,9 +1054,14 @@ rb_dir_getwd(void) VALUE cwd; rb_encoding *fs = rb_filesystem_encoding(); int fsenc = rb_enc_to_index(fs); + VALUE path_guard; +#undef RUBY_UNTYPED_DATA_WARNING +#define RUBY_UNTYPED_DATA_WARNING 0 if (fsenc == ENCINDEX_US_ASCII) fsenc = ENCINDEX_ASCII; + path_guard = Data_Wrap_Struct((VALUE)0, NULL, RUBY_DEFAULT_FREE, NULL); path = my_getcwd(); + DATA_PTR(path_guard) = path; #ifdef _WIN32 cwd = rb_str_conv_enc(rb_utf8_str_new_cstr(path), NULL, fs); #else @@ -1068,6 +1073,7 @@ rb_dir_getwd(void) #endif rb_enc_associate_index(cwd, fsenc); #endif + DATA_PTR(path_guard) = 0; xfree(path); return cwd; @@ -511,7 +511,10 @@ ruby_getcwd(void) char *buf = xmalloc(2); strcpy(buf, "."); #elif defined HAVE_GETCWD +# undef RUBY_UNTYPED_DATA_WARNING +# define RUBY_UNTYPED_DATA_WARNING 0 # if defined NO_GETCWD_MALLOC + VALUE guard = Data_Wrap_Struct((VALUE)0, NULL, RUBY_DEFAULT_FREE, NULL); int size = 200; char *buf = xmalloc(size); @@ -519,17 +522,22 @@ ruby_getcwd(void) int e = errno; if (e != ERANGE) { xfree(buf); + DATA_PTR(guard) = NULL; rb_syserr_fail(e, "getcwd"); } size *= 2; + DATA_PTR(guard) = buf; buf = xrealloc(buf, size); } # else + VALUE guard = Data_Wrap_Struct((VALUE)0, NULL, free, NULL); char *buf, *cwd = getcwd(NULL, 0); + DATA_PTR(guard) = cwd; if (!cwd) rb_sys_fail("getcwd"); buf = ruby_strdup(cwd); /* allocate by xmalloc */ free(cwd); # endif + DATA_PTR(RB_GC_GUARD(guard)) = NULL; #else # ifndef PATH_MAX # define PATH_MAX 8192 |