[macruby-changes] [1624] MacRuby/branches/experimental

source_changes at macosforge.org source_changes at macosforge.org
Thu May 28 14:25:03 PDT 2009


Revision: 1624
          http://trac.macosforge.org/projects/ruby/changeset/1624
Author:   lsansonetti at apple.com
Date:     2009-05-28 14:25:02 -0700 (Thu, 28 May 2009)
Log Message:
-----------
misc bug fix

Modified Paths:
--------------
    MacRuby/branches/experimental/compiler.cpp
    MacRuby/branches/experimental/vm.cpp

Modified: MacRuby/branches/experimental/compiler.cpp
===================================================================
--- MacRuby/branches/experimental/compiler.cpp	2009-05-28 20:38:09 UTC (rev 1623)
+++ MacRuby/branches/experimental/compiler.cpp	2009-05-28 21:25:02 UTC (rev 1624)
@@ -4199,7 +4199,7 @@
     assert(len < buflen);
     strncpy(buf, p, len);
     buf[len] = '\0';
-    return p2;
+    return SkipStackSize(p2);
 }
 
 static inline void

Modified: MacRuby/branches/experimental/vm.cpp
===================================================================
--- MacRuby/branches/experimental/vm.cpp	2009-05-28 20:38:09 UTC (rev 1623)
+++ MacRuby/branches/experimental/vm.cpp	2009-05-28 21:25:02 UTC (rev 1624)
@@ -1134,7 +1134,7 @@
 
 	std::map<SEL, std::string>::iterator iter = map.find(sel);	
 	if (iter != map.end()) {
-	    strncpy(buf, iter->second.c_str(), sizeof buf);
+	    strncpy(buf, iter->second.c_str(), buflen);
 	}
 	else {
 	    assert(oc_arity < buflen);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090528/e6546cae/attachment.html>


More information about the macruby-changes mailing list