File tree Expand file tree Collapse file tree 1 file changed +21
-9
lines changed
DbgProvider/public/Debugger Expand file tree Collapse file tree 1 file changed +21
-9
lines changed Original file line number Diff line number Diff line change @@ -118,13 +118,14 @@ public string SymbolName
118
118
{
119
119
get
120
120
{
121
- if ( null = = Function )
121
+ if ( null ! = Function )
122
122
{
123
- return DbgProvider . FormatAddress ( InstructionPointer ,
124
- Debugger . TargetIs32Bit ,
125
- useTick : true ) ;
123
+ return Function . ModuleQualifiedName ;
126
124
}
127
- return Function . ModuleQualifiedName ;
125
+
126
+ return DbgProvider . FormatAddress ( InstructionPointer ,
127
+ Debugger . TargetIs32Bit ,
128
+ useTick : true ) ;
128
129
}
129
130
} // end property SymbolName
130
131
@@ -326,10 +327,21 @@ public override string ToString()
326
327
}
327
328
} // end if( !Function )
328
329
329
- if ( Displacement == 0 )
330
- return SymbolName ;
331
- else
332
- return Util . Sprintf ( "{0}+0x{1:x}" , SymbolName , Displacement ) ;
330
+ try
331
+ {
332
+ if ( Displacement == 0 )
333
+ return SymbolName ;
334
+ else
335
+ return Util . Sprintf ( "{0}+0x{1:x}" , SymbolName , Displacement ) ;
336
+ }
337
+ catch ( DbgProviderException dpe )
338
+ {
339
+ LogManager . Trace ( "Could not get symbol name: {0}" , Util . GetExceptionMessages ( dpe ) ) ;
340
+ }
341
+
342
+ return DbgProvider . FormatAddress ( InstructionPointer ,
343
+ Debugger . TargetIs32Bit ,
344
+ useTick : true ) ;
333
345
} // end ToString()
334
346
335
347
You can’t perform that action at this time.
0 commit comments