Author: spouliot
Date: 2005-03-31 08:40:08 -0500 (Thu, 31 Mar 2005)
New Revision: 42422
Modified:
trunk/mcs/class/corlib/System.Resources/ChangeLog
trunk/mcs/class/corlib/System.Resources/ResourceReader.cs
trunk/mcs/class/corlib/System.Resources/ResourceSet.cs
Log:
2005-03-31 Sebastien Pouliot <[EMAIL PROTECTED]>
* ResourceReader.cs, ResourceSet.cs: Added a LinkDemand for
SerializationFormatter when using a Stream constructor (other ctors
have different security - e.g. FileIOPermission for opening a file).
Modified: trunk/mcs/class/corlib/System.Resources/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Resources/ChangeLog 2005-03-31 13:21:26 UTC
(rev 42421)
+++ trunk/mcs/class/corlib/System.Resources/ChangeLog 2005-03-31 13:40:08 UTC
(rev 42422)
@@ -1,3 +1,9 @@
+2005-03-31 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * ResourceReader.cs, ResourceSet.cs: Added a LinkDemand for
+ SerializationFormatter when using a Stream constructor (other ctors
+ have different security - e.g. FileIOPermission for opening a file).
+
2005-03-22 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* ResourceManager.cs: use culture.Equals in InternalGetResourceSet().
Modified: trunk/mcs/class/corlib/System.Resources/ResourceReader.cs
===================================================================
--- trunk/mcs/class/corlib/System.Resources/ResourceReader.cs 2005-03-31
13:21:26 UTC (rev 42421)
+++ trunk/mcs/class/corlib/System.Resources/ResourceReader.cs 2005-03-31
13:40:08 UTC (rev 42422)
@@ -7,11 +7,8 @@
// Dick Porter <[EMAIL PROTECTED]>
//
// (C) 2001, 2002 Ximian Inc, http://www.ximian.com
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
@@ -38,6 +35,7 @@
using System.Text;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
+using System.Security.Permissions;
namespace System.Resources
{
@@ -54,6 +52,7 @@
long nameSectionOffset;
// Constructors
+ [SecurityPermission (SecurityAction.LinkDemand,
SerializationFormatter = true)]
public ResourceReader (Stream stream)
{
if (stream == null)
Modified: trunk/mcs/class/corlib/System.Resources/ResourceSet.cs
===================================================================
--- trunk/mcs/class/corlib/System.Resources/ResourceSet.cs 2005-03-31
13:21:26 UTC (rev 42421)
+++ trunk/mcs/class/corlib/System.Resources/ResourceSet.cs 2005-03-31
13:40:08 UTC (rev 42422)
@@ -7,11 +7,8 @@
// Andreas Nahr ([EMAIL PROTECTED])
//
// (C) 2001, 2002 Ximian, Inc. http://www.ximian.com
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
@@ -36,6 +33,7 @@
using System.IO;
using System.Globalization;
using System.Runtime.InteropServices;
+using System.Security.Permissions;
namespace System.Resources
{
@@ -61,6 +59,7 @@
Reader = reader;
}
+ [SecurityPermission (SecurityAction.LinkDemand,
SerializationFormatter = true)]
public ResourceSet (Stream stream)
{
if(stream==null) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
