Backport security fix from ruby developer Shugo Maeda, similar to

SVN revision 37068.

OK jasper@
This commit is contained in:
jeremy 2012-10-08 13:15:17 +00:00
parent 5c5fe46d1b
commit d8416fa81d
2 changed files with 19 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2012/09/18 16:02:53 jeremy Exp $
# $OpenBSD: Makefile,v 1.26 2012/10/08 13:15:17 jeremy Exp $
COMMENT-main= object oriented script language with threads
COMMENT-iconv= libiconv interface for ruby
@ -16,7 +16,7 @@ PKGNAME-gdbm= ruby-gdbm-${VERSION}.${PATCHLEVEL}
PKGNAME-tk= ruby-tk-${VERSION}.${PATCHLEVEL}
PKGNAME-ri_docs= ruby-ri_docs-${VERSION}.${PATCHLEVEL}
REVISION-main= 0
REVISION-main= 1
PKG_ARCH-ri_docs= *
PKGSPEC-main= ruby->=1.8,<1.9

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-error_c,v 1.2 2012/10/08 13:15:17 jeremy Exp $
Backport security fix, from Shugo Maeda (ruby developer), similar to
changes in ruby SVN revision 37068.
--- error.c.orig Mon Oct 8 03:43:34 2012
+++ error.c Mon Oct 8 03:43:49 2012
@@ -665,9 +665,6 @@ name_err_to_s(exc)
if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
StringValue(str);
- if (str != mesg) {
- OBJ_INFECT(str, mesg);
- }
return str;
}