Fix poll error in process.libs() and clean up maps parsing (#2579)

Co-authored-by: Raccoon <raccoon@42>
Co-authored-by: peace-maker <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -150,6 +150,7 @@ The table below shows which release corresponds to each branch, and what date th
 - [#2593][2593] Use unicorn on macOS w/ SIP enabled
 - [#2587][2587] Support longer function names in Windows `getexport` shellcode
 - [#2596][2596] Ignore `colored_traceback` error when TERM envvar is unset
+- [#2579][2579] Fix poll error in `process.libs()` and clean up maps parsing
 
 [2545]: https://github.com/Gallopsled/pwntools/pull/2545
 [2567]: https://github.com/Gallopsled/pwntools/pull/2567
@@ -158,6 +159,7 @@ The table below shows which release corresponds to each branch, and what date th
 [2593]: https://github.com/Gallopsled/pwntools/pull/2593
 [2587]: https://github.com/Gallopsled/pwntools/pull/2587
 [2596]: https://github.com/Gallopsled/pwntools/pull/2596
+[2579]: https://github.com/Gallopsled/pwntools/pull/2579
 
 ## 4.14.1 (`stable`)
 

pwnlib/tubes/process.py

@@ -1322,8 +1322,7 @@ def libs(self):
         by the process to the address it is loaded at in the process' address
         space.
         """
-        from pwnlib.util.proc import memory_maps
-        maps_raw = self.poll() is not None and memory_maps(self.pid)
+        maps_raw = self.poll() is None and self.maps()
 
         if not maps_raw:
             import pwnlib.elf.elf
@@ -1332,23 +1331,15 @@ def libs(self):
                 return pwnlib.elf.elf.ELF(self.executable).maps
 
         # Enumerate all of the libraries actually loaded right now.
-        maps = {}
+        libs = {}
         for mapping in maps_raw:
             path = mapping.path
             if os.sep not in path: continue
             path = os.path.realpath(path)
-            if path not in maps:
-                maps[path]=0
-
-        for lib in maps:
-            path = os.path.realpath(lib)
-            for mapping in maps_raw:
-                if mapping.path == path:
-                    address = mapping.addr.split('-')[0]
-                    maps[lib] = int(address, 16)
-                    break
+            if path not in libs:
+                libs[path] = mapping.addr
 
-        return maps
+        return libs
 
     @property
     def libc(self):