diff options
| author | David Schulz <david.schulz@qt.io> | 2017-03-31 10:44:28 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2017-04-04 08:23:30 +0000 |
| commit | 16b323500356c084f2c99d3803381dc6354ad4c8 (patch) | |
| tree | 0a3f9628ae64af27982bdf355c87a3da9aee4b8d /share | |
| parent | cafd4a4626fda6d8f701fd1b88e62b1ab35e7cf0 (diff) | |
| download | qt-creator-16b323500356c084f2c99d3803381dc6354ad4c8.tar.gz | |
Debugger: Catch memory read exceptions in getJumpAddress
Throwing an exception in these cases is not uncommon and should
be handled properly.
Change-Id: I8d4377bf26a4e31971da724904dd5ea5f01a95e1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/debugger/dumper.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index 9a019f87c3..71f615da37 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -1497,7 +1497,10 @@ class DumperBase: def getJumpAddress_x86(dumper, address): relativeJumpCode = 0xe9 jumpCode = 0xff - data = dumper.readRawMemory(address, 6) + try: + data = dumper.readRawMemory(address, 6) + except: + return 0 primaryOpcode = data[0] if primaryOpcode == relativeJumpCode: # relative jump on 32 and 64 bit with a 32bit offset |