[ruby-core:30958] [PATCH] ignored strdup: twice

Here are two places where a failed strdup appears to
be ignored.  In one case, it would result in a NULL dereference.
In the other, it would cause PATH to be silently reset.

You can confirm that these are not mapped to ruby_strdup
by running nm *.o|grep strdup.


From 2f170de32b0956749d4e4fb4eccf7084044f0017 Mon Sep 17 00:00:00 2001
From: Jim Meyering <[e-mail]>
Date: Tue, 29 Jun 2010 14:38:20 +0200
Subject: [PATCH 1/2] avoid NULL-dereference in zone_str

* time.c (zone_str): Include util.h for its strdup->ruby_strdup
definition.  That is required to avoid a NULL dereference upon OOM.
---
 time.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/time.c b/time.c
index 934cfd7..90086a7 100644
--- a/time.c
+++ b/time.c
@@ -14,6 +14,7 @@
 #include <time.h>
 #include <errno.h>
 #include "ruby/encoding.h"
+#include "ruby/util.h"

 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
--
1.7.2.rc0.206.g3336


From fac8e79523f4dde4741928546777e1b0a1d74137 Mon Sep 17 00:00:00 2001
From: Jim Meyering <[e-mail]>
Date: Tue, 29 Jun 2010 14:43:32 +0200
Subject: [PATCH 2/2] do not let failed strdup cause PATH reset

* dln_find.c (dln_find_exe_r): Include "ruby/util.h" for its strdup->
ruby_strdup mapping.  Otherwise, a failed strdup would make us use
a default search PATH.
---
 dln_find.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/dln_find.c b/dln_find.c
index 728ace8..6317eb9 100644
--- a/dln_find.c
+++ b/dln_find.c
@@ -11,6 +11,7 @@

 #ifdef RUBY_EXPORT
 #include "ruby/ruby.h"
+#include "ruby/util.h"
 #define dln_notimplement rb_notimplement
 #define dln_memerror rb_memerror
 #define dln_exit rb_exit
--
1.7.2.rc0.206.g3336