diff options
| author | Sebastien Pouliot <sebastien@ximian.com> | 2005-01-28 04:05:49 +0300 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@ximian.com> | 2005-01-28 04:05:49 +0300 |
| commit | 48fcf680248e4621f35f9d3099c3cdfa52adc743 (patch) | |
| tree | 5e86e2fe86aa7496c2a20b5a456733d98c0b85fd /mcs | |
| parent | b418c03068252a73799e6a6dc729dc72a2266c4f (diff) | |
2005-01-27 Sebastien Pouliot <sebastien@ximian.com>
* BadImageFormatException.cs: Protect the fusion (GAC) log from being
disclosed unless code has ControlPolicy and ControlEvidence.
svn path=/trunk/mcs/; revision=39679
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/corlib/System/BadImageFormatException.cs | 13 | ||||
| -rw-r--r-- | mcs/class/corlib/System/ChangeLog | 5 |
2 files changed, 12 insertions, 6 deletions
diff --git a/mcs/class/corlib/System/BadImageFormatException.cs b/mcs/class/corlib/System/BadImageFormatException.cs index 59279e8cdf8..ed0f6cb4b8c 100644 --- a/mcs/class/corlib/System/BadImageFormatException.cs +++ b/mcs/class/corlib/System/BadImageFormatException.cs @@ -7,10 +7,7 @@ // Andreas Nahr (ClassDevelopment@A-SoftTech.com) // // (C) 2001 Ximian, Inc. -// - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -33,6 +30,7 @@ // using System.Runtime.Serialization; +using System.Security.Permissions; namespace System { @@ -97,8 +95,11 @@ namespace System } [MonoTODO ("Probably not entirely correct. fusionLog needs to be set somehow (we are probably missing internal constuctor)")] - public string FusionLog - { + public string FusionLog { + // note: MS runtime throws a SecurityException when the Exception is created + // but a FileLoadException once the exception as been thrown. Mono always + // throw a SecurityException in both case (anyway fusionLog is currently empty) + [SecurityPermission (SecurityAction.Demand, ControlEvidence=true, ControlPolicy=true)] get { return fusionLog; } } diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog index d3493ac1637..65d75ebb3d9 100644 --- a/mcs/class/corlib/System/ChangeLog +++ b/mcs/class/corlib/System/ChangeLog @@ -1,3 +1,8 @@ +2005-01-27 Sebastien Pouliot <sebastien@ximian.com> + + * BadImageFormatException.cs: Protect the fusion (GAC) log from being + disclosed unless code has ControlPolicy and ControlEvidence. + 2005-01-27 Zoltan Varga <vargaz@freemail.hu> * Exception.cs: Compute stack trace on demand. |