pythongh-129223: Raise KeyError in search_map_for_section() if not found

vstinner · Jan 24, 2025 · c8c5241 · c8c5241
1 parent fc6bc1e
commit c8c5241
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Lib/test/test_external_inspection.py b/Lib/test/test_external_inspection.py
@@ -63,6 +63,8 @@ def foo():
                 stack_trace = get_stack_trace(p.pid)
             except PermissionError:
                 self.skipTest("Insufficient permissions to read the stack trace")
+            except KeyError as exc:
+                self.skipTest(str(exc))
             finally:
                 os.remove(fifo)
                 p.kill()
@@ -147,6 +149,8 @@ def new_eager_loop():
                 except PermissionError:
                     self.skipTest(
                         "Insufficient permissions to read the stack trace")
+                except KeyError as exc:
+                    self.skipTest(str(exc))
                 finally:
                     os.remove(fifo)
                     p.kill()
@@ -212,6 +216,8 @@ async def main():
                 stack_trace = get_async_stack_trace(p.pid)
             except PermissionError:
                 self.skipTest("Insufficient permissions to read the stack trace")
+            except KeyError as exc:
+                self.skipTest(str(exc))
             finally:
                 os.remove(fifo)
                 p.kill()
@@ -272,6 +278,8 @@ async def main():
             except PermissionError:
                 self.skipTest(
                     "Insufficient permissions to read the stack trace")
+            except KeyError as exc:
+                self.skipTest(str(exc))
             finally:
                 os.remove(fifo)
                 p.kill()

diff --git a/Modules/_testexternalinspection.c b/Modules/_testexternalinspection.c
@@ -383,6 +383,10 @@ search_map_for_section(pid_t pid, const char* secname, const char* map)
             );
         result = start_address + (uintptr_t)section->sh_addr - elf_load_addr;
     }
+    else {
+        PyErr_Format(PyExc_KeyError,
+                     "cannot find map for section %s", secname);
+    }
 
 exit:
     if (close(fd) != 0) {