Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

提交 b7f1dee1 编写于 作者: A acasey
浏览文件
操作

DevDiv #999806: Don't crash on invalid import strings in PDBs 

We have several examples of invalid import strings in already-shipped Microsoft PDBs, so we can't crash when we see such strings.  I couldn't bring myself to drop import strings entirely silently, so we still output to Debug.WriteLine so that an attached debugger gets some indication that there's a problem.

CR: ChuckS; VSadov (changeset 1314669)
上级 4fae87ce
隐藏空白更改
内联 并排
Showing with 52 addition and 40 deletion
Src/Test/PdbUtilities/Pdb/PdbToXml.cs
浏览文件 @ b7f1dee1
......@@ -563,7 +563,8 @@ private void WriteNamespace(ISymUnmanagedNamespace @namespace)
if (rawName.Length == 0)
{
externAlias = null;
CDI.ParseVisualBasicImportString(rawName, out alias, out target, out kind, out scope);
var parsingSucceeded = CDI.TryParseVisualBasicImportString(rawName, out alias, out target, out kind, out scope);
Debug.Assert(parsingSucceeded);
}
else
{
......@@ -575,12 +576,18 @@ private void WriteNamespace(ISymUnmanagedNamespace @namespace)
case 'Z':
case 'E':
scope = ImportScope.Unspecified;
CDI.ParseCSharpImportString(rawName, out alias, out externAlias, out target, out kind);
if (!CDI.TryParseCSharpImportString(rawName, out alias, out externAlias, out target, out kind))
{
throw new InvalidOperationException(string.Format("Invalid import '{0}'", rawName));
}
break;
default:
externAlias = null;
CDI.ParseVisualBasicImportString(rawName, out alias, out target, out kind, out scope);
if (!CDI.TryParseVisualBasicImportString(rawName, out alias, out target, out kind, out scope))
{
throw new InvalidOperationException(string.Format("Invalid import '{0}'", rawName));
}
break;
}
}
......
Src/Test/PdbUtilities/Shared/CustomDebugInfoReader.cs
浏览文件 @ b7f1dee1
......@@ -541,16 +541,16 @@ public static bool IsCSharpExternAliasInfo(string import)
/// "ESystem alias" -> <namespace qualifier="alias" name="System" />
/// ]]>
/// </remarks>
public static void ParseCSharpImportString(string import, out string alias, out string externAlias, out string target, out ImportTargetKind kind)
public static bool TryParseCSharpImportString(string import, out string alias, out string externAlias, out string target, out ImportTargetKind kind)
{
if (import == null)
{
throw new ArgumentNullException("import");
}
alias = null;
externAlias = null;
target = null;
kind = default(ImportTargetKind);
if (import.Length == 0)
if (string.IsNullOrEmpty(import))
{
throw new ArgumentException(import, "import");
return false;
}
switch (import[0])
......@@ -560,22 +560,22 @@ public static void ParseCSharpImportString(string import, out string alias, out
externAlias = null;
target = import.Substring(1);
kind = ImportTargetKind.Namespace;
return;
return true;
case 'E': // C# using
// NOTE: Dev12 has related cases "I" and "O" in EMITTER::ComputeDebugNamespace,
// but they were probably implementation details that do not affect roslyn.
if (!TrySplit(import, 1, ' ', out target, out externAlias))
{
throw new ArgumentException(import, "import");
return false;
}
alias = null;
kind = ImportTargetKind.Namespace;
return;
return true;
case 'A': // C# type or namespace alias
if (!TrySplit(import, 1, ' ', out alias, out target))
{
throw new ArgumentException(import, "import");
return false;
}
switch (target[0])
......@@ -584,39 +584,39 @@ public static void ParseCSharpImportString(string import, out string alias, out
kind = ImportTargetKind.Namespace;
target = target.Substring(1);
externAlias = null;
return;
return true;
case 'T':
kind = ImportTargetKind.Type;
target = target.Substring(1);
externAlias = null;
return;
return true;
case 'E':
kind = ImportTargetKind.Namespace; // Never happens for types.
if (!TrySplit(target, 1, ' ', out target, out externAlias))
{
throw new ArgumentException(import, "import");
return false;
}
return;
return true;
default:
throw new ArgumentException(import, "import");
return false;
}
case 'X': // C# extern alias (in file)
externAlias = import.Substring(1);
alias = null;
target = null;
kind = ImportTargetKind.Assembly;
return;
return true;
case 'Z': // C# extern alias (module-level)
if (!TrySplit(import, 1, ' ', out externAlias, out target))
{
throw new ArgumentException(import, "import");
return false;
}
alias = null;
kind = ImportTargetKind.Assembly;
return;
return true;
default:
throw new ArgumentException(import, "import");
return false;
}
}
......@@ -625,11 +625,16 @@ public static void ParseCSharpImportString(string import, out string alias, out
/// </summary>
/// <exception cref="ArgumentNullException"><paramref name="import"/> is null.</exception>
/// <exception cref="ArgumentException">Format of <paramref name="import"/> is not valid.</exception>
public static void ParseVisualBasicImportString(string import, out string alias, out string target, out ImportTargetKind kind, out ImportScope scope)
public static bool TryParseVisualBasicImportString(string import, out string alias, out string target, out ImportTargetKind kind, out ImportScope scope)
{
alias = null;
target = null;
kind = default(ImportTargetKind);
scope = default(ImportScope);
if (import == null)
{
throw new ArgumentNullException("import");
return false;
}
if (import.Length == 0) // VB current namespace
......@@ -638,7 +643,7 @@ public static void ParseVisualBasicImportString(string import, out string alias,
target = import;
kind = ImportTargetKind.CurrentNamespace;
scope = ImportScope.Unspecified;
return;
return true;
}
// TODO (acasey): looks like we missed some cases (e.g. '$', '#', '&')
......@@ -654,13 +659,13 @@ public static void ParseVisualBasicImportString(string import, out string alias,
target = import.Substring(pos);
kind = ImportTargetKind.DefaultNamespace;
scope = ImportScope.Unspecified;
return;
return true;
case '@': // VB cases other than default and current namespace
// see PEBuilder.cpp in vb\language\CodeGen
pos++;
if (pos >= import.Length)
{
throw new ArgumentException(import, "import");
return false;
}
scope = ImportScope.Unspecified;
......@@ -678,7 +683,7 @@ public static void ParseVisualBasicImportString(string import, out string alias,
if (pos >= import.Length)
{
throw new ArgumentException(import, "import");
return false;
}
switch (import[pos])
......@@ -687,62 +692,62 @@ public static void ParseVisualBasicImportString(string import, out string alias,
pos++;
if (import[pos] != ':')
{
throw new ArgumentException(import, "import");
return false;
}
pos++;
if (!TrySplit(import, pos, '=', out alias, out target))
{
throw new ArgumentException(import, "import");
return false;
}
kind = ImportTargetKind.NamespaceOrType;
return;
return true;
case 'X':
pos++;
if (import[pos] != ':')
{
throw new ArgumentException(import, "import");
return false;
}
pos++;
if (!TrySplit(import, pos, '=', out alias, out target))
{
throw new ArgumentException(import, "import");
return false;
}
kind = ImportTargetKind.XmlNamespace;
return;
return true;
case 'T':
pos++;
if (import[pos] != ':')
{
throw new ArgumentException(import, "import");
return false;
}
pos++;
alias = null;
target = import.Substring(pos);
kind = ImportTargetKind.Type;
return;
return true;
case ':':
pos++;
alias = null;
target = import.Substring(pos);
kind = ImportTargetKind.Namespace;
return;
return true;
default:
alias = null;
target = import.Substring(pos);
kind = ImportTargetKind.MethodToken;
return;
return true;
}
default: // VB current namespace
alias = null;
target = import;
kind = ImportTargetKind.CurrentNamespace;
scope = ImportScope.Unspecified;
return;
return true;
}
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或