From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 4 Aug 2011 17:34:59 +0000 (+0200)
Subject: updated for version 7.3.267
X-Git-Tag: v7.3.267
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f5f795f7656aa986d449d2f72c3d0b4fe4703ed;p=vim

updated for version 7.3.267
Problem:    Ruby on Mac OS X 10.7 may crash.
Solution:   Avoid alloc(0). (Bjorn Winckler)
---

diff --git a/src/if_ruby.c b/src/if_ruby.c
index a45269d6e..5dc32858b 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -761,11 +761,19 @@ static VALUE vim_message(VALUE self UNUSED, VALUE str)
     char *buff, *p;
 
     str = rb_obj_as_string(str);
-    buff = ALLOCA_N(char, RSTRING_LEN(str));
-    strcpy(buff, RSTRING_PTR(str));
-    p = strchr(buff, '\n');
-    if (p) *p = '\0';
-    MSG(buff);
+    if (RSTRING_LEN(str) > 0)
+    {
+	/* Only do this when the string isn't empty, alloc(0) causes trouble. */
+	buff = ALLOCA_N(char, RSTRING_LEN(str));
+	strcpy(buff, RSTRING_PTR(str));
+	p = strchr(buff, '\n');
+	if (p) *p = '\0';
+	MSG(buff);
+    }
+    else
+    {
+	MSG("");
+    }
     return Qnil;
 }
 
diff --git a/src/version.c b/src/version.c
index f6471cf44..6bddff0cc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    267,
 /**/
     266,
 /**/