pythongh-130052: Fix search_map_for_section() error handling (python#132594)

vstinner · web-flow · commit 014c7f904787 · 2025-04-16T13:56:58.000Z
* Don't call close() if the file descriptor is negative.
* If close() fails, chain the existing exception.
diff --git a/Modules/_testexternalinspection.c b/Modules/_testexternalinspection.c
@@ -400,8 +400,10 @@ search_map_for_section(pid_t pid, const char* secname, const char* map)
     }
 
 exit:
-    if (close(fd) != 0) {
+    if (fd >= 0 && close(fd) != 0) {
+        PyObject *exc = PyErr_GetRaisedException();
         PyErr_SetFromErrno(PyExc_OSError);
+        _PyErr_ChainExceptions1(exc);
     }
     if (file_memory != NULL) {
         munmap(file_memory, file_stats.st_size);

Original file line number	Diff line number	Diff line change
`@@ -400,8 +400,10 @@ search_map_for_section(pid_t pid, const char* secname, const char* map)`
`400`	`400`	`}`
`401`	`401`
`402`	`402`	`exit:`
`403`		`- if (close(fd) != 0) {`
	`403`	`+ if (fd >= 0 && close(fd) != 0) {`
	`404`	`+ PyObject *exc = PyErr_GetRaisedException();`
`404`	`405`	`PyErr_SetFromErrno(PyExc_OSError);`
	`406`	`+ _PyErr_ChainExceptions1(exc);`
`405`	`407`	`}`
`406`	`408`	`if (file_memory != NULL) {`
`407`	`409`	`munmap(file_memory, file_stats.st_size);`