[DRE-commits] [SCM] ruby-eventmachine.git branch, master, updated. debian/0.12.10-2-6-g6257b2f

[Per Andersson]

The following commit has been merged in the master branch:
commit bba483593b92fb7916a692c38157f935659ea61c
Author: Per Andersson <avtobiff at gmail.com>
Date:   Sat Jun 9 01:28:21 2012 +0200

    Add patch for formatting error strings safely. (Closes: #676209)

diff --git a/debian/patches/0001-Format-error-strings-safely.patch b/debian/patches/0001-Format-error-strings-safely.patch
new file mode 100644
index 0000000..e288efd
--- /dev/null
+++ b/debian/patches/0001-Format-error-strings-safely.patch
@@ -0,0 +1,49 @@
+From: Per Andersson <avtobiff at gmail.com>
+Date: Sat, 9 Jun 2012 00:48:17 +0200
+Subject: Format error strings safely.
+
+---
+ ext/rubymain.cpp |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ext/rubymain.cpp b/ext/rubymain.cpp
+index e6b39e4..53510b5 100644
+--- a/ext/rubymain.cpp
++++ b/ext/rubymain.cpp
+@@ -499,7 +499,7 @@ static VALUE t_connect_server (VALUE self, VALUE server, VALUE port)
+ 			rb_raise (EM_eConnectionError, "no connection");
+ 		return ULONG2NUM (f);
+ 	} catch (std::runtime_error e) {
+-		rb_raise (EM_eConnectionError, e.what());
++		rb_raise (EM_eConnectionError, "%s", e.what());
+ 	}
+ 	return Qnil;
+ }
+@@ -520,7 +520,7 @@ static VALUE t_bind_connect_server (VALUE self, VALUE bind_addr, VALUE bind_port
+ 			rb_raise (EM_eConnectionError, "no connection");
+ 		return ULONG2NUM (f);
+ 	} catch (std::runtime_error e) {
+-		rb_raise (EM_eConnectionError, e.what());
++		rb_raise (EM_eConnectionError, "%s", e.what());
+ 	}
+ 	return Qnil;
+ }
+@@ -805,7 +805,7 @@ static VALUE t_watch_filename (VALUE self, VALUE fname)
+ 	try {
+ 		return ULONG2NUM(evma_watch_filename(StringValuePtr(fname)));
+ 	} catch (std::runtime_error e) {
+-		rb_raise (EM_eUnsupported, e.what());
++		rb_raise (EM_eUnsupported, "%s", e.what());
+ 	}
+ 	return Qnil;
+ }
+@@ -831,7 +831,7 @@ static VALUE t_watch_pid (VALUE self, VALUE pid)
+ 	try {
+ 		return ULONG2NUM(evma_watch_pid(NUM2INT(pid)));
+ 	} catch (std::runtime_error e) {
+-		rb_raise (EM_eUnsupported, e.what());
++		rb_raise (EM_eUnsupported, "%s", e.what());
+ 	}
+ 	return Qnil;
+ }
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..235c4c1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Format-error-strings-safely.patch

-- 
ruby-eventmachine.git