summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-26 05:51:36 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-26 05:51:36 +0000
commit859f3d14eda5ecd59ed7a7172dc63cdfa2acba92 (patch)
tree696e310045987ee69419787515593fdb506a542f
parentea9ff28f80165ec054106702ee38f5995bc4a491 (diff)
never-NULL pointer check
* dir.c (ruby_glob0): no need to check never-NULL pointer. reported by Denis Denisov <denji0k AT gmail.com>. * win32/file.c (rb_file_expand_path_internal): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--dir.c2
-rw-r--r--win32/file.c2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 06f0ca4..ab5031f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-Fri Dec 26 14:48:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Dec 26 14:51:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (ruby_glob0): no need to check never-NULL pointer.
+ reported by Denis Denisov <denji0k AT gmail.com>.
+
+ * win32/file.c (rb_file_expand_path_internal): ditto.
* win32/file.c (code_page_i): handle realloc failure.
reported by Denis Denisov <denji0k AT gmail.com>.
diff --git a/dir.c b/dir.c
index 5386ff0..5190ea4 100644
--- a/dir.c
+++ b/dir.c
@@ -1690,7 +1690,7 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_enco
root = rb_enc_path_skip_prefix(root, root + strlen(root), enc);
#endif
- if (root && *root == '/') root++;
+ if (*root == '/') root++;
n = root - start;
buf = GLOB_ALLOC_N(char, n + 1);
diff --git a/win32/file.c b/win32/file.c
index e2b7f93..f51a778 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -626,7 +626,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
if (whome)
xfree(whome);
- if (wfullpath && wfullpath != wfullpath_buffer)
+ if (wfullpath != wfullpath_buffer)
xfree(wfullpath);
if (fullpath)