Fix JRUBY-6193 by replacing usage of asprintf() with alloca(3)+snprin…

…tf(3)
tenderlove · Jan 26, 2012 · 69709ce · 69709ce
1 parent b9c585a
commit 69709ce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 97 deletions.
diff --git a/cext/src/include/ruby/asprintf.h b/cext/src/include/ruby/asprintf.h
diff --git a/cext/src/include/ruby/ruby.h b/cext/src/include/ruby/ruby.h
@@ -35,20 +35,12 @@
 // Some platform specific includes
 #if defined(__WIN32__) || defined(__MINGW32__)
 #   include "jruby_win32.h"
-#   include "asprintf.h"
 #else
 #   define RUBY_DLLSPEC
 #       include <sys/select.h>
 #       include <pthread.h>
 #endif
 
-#if defined (__SVR4) && defined (__sun)
-#   define HAVE_VA_COPY
-#   ifndef asprintf
-#     include "asprintf.h"
-#   endif
-#endif
-
 #ifdef RUBY_EXTCONF_H
 #include RUBY_EXTCONF_H
 #endif

diff --git a/cext/src/object.cpp b/cext/src/object.cpp
@@ -19,7 +19,8 @@
  * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
+#include <stdio.h>
+#include <stdlib.h>
 #include "jruby.h"
 #include "ruby.h"
 #include "JLocalEnv.h"
@@ -270,16 +271,14 @@ extern "C" VALUE
 rb_any_to_s(VALUE obj)
 {
     char* buf;
+    int len = 128, buflen;
 
-    if (asprintf(&buf, "#<%s:%p>", rb_obj_classname(obj), (void *) obj) == -1) {
-        // Could not allocate
-        return rb_str_new("", 0);
-    }
-
-    VALUE result = rb_str_new_cstr(buf);
-    free(buf);
+    do {
+	buf = (char *) alloca(buflen = len);
+        len = snprintf(buf, buflen, "#<%s:%p>", rb_obj_classname(obj), (void *) obj);
+    } while (len >= buflen);
 
-    return result;
+    return rb_str_new_cstr(buf);
 }
 
 extern "C" void