From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 24 Sep 2019 03:52:50 +0000 (-0700)
Subject: closes bpo-16637: libpython: construct integer object directly from gdbvalue (GH... 
X-Git-Tag: v3.8.0rc1~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b94eb8d14f5a5b20dc2a999d6ca6219214b458c;p=python

closes bpo-16637: libpython: construct integer object directly from gdbvalue (GH-15232)


This fixes the exception '`ValueError: invalid literal for int() with base 10`
if `str(gdbval)` returns a hexadecimal value (e.g. '0xa0'). This is the case if
the output-radix is set to 16 in gdb. See
https://sourceware.org/gdb/onlinedocs/gdb/Numbers.html for more information.
(cherry picked from commit 6f53d34fb0f944a8c0ee530334c353559ac40f72)

Co-authored-by: Marc Hartmayer <marc1006@users.noreply.github.com>
---

diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index e40f79b5c3..93f997c21e 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -1392,7 +1392,7 @@ class wrapperobject(PyObjectPtr):
 
 
 def int_from_int(gdbval):
-    return int(str(gdbval))
+    return int(gdbval)
 
 
 def stringify(val):