[pypy-commit] pypy release-5.x: name can be None

stefanor pypy.commits at gmail.com
Thu Sep 1 23:36:37 EDT 2016


Author: Stefano Rivera <stefano at rivera.za.net>
Branch: release-5.x
Changeset: r86828:3806b361cac3
Date: 2016-09-01 20:35 -0700
http://bitbucket.org/pypy/pypy/changeset/3806b361cac3/

Log:	name can be None

diff --git a/rpython/rlib/rdynload.py b/rpython/rlib/rdynload.py
--- a/rpython/rlib/rdynload.py
+++ b/rpython/rlib/rdynload.py
@@ -171,7 +171,7 @@
         # haaaack for 'pypy py.test -A' if libm.so is a linker script
         # (see reason in _dlerror_on_dlopen_untranslated())
         if not we_are_translated() and platform.name == "linux":
-            if rffi.charp2str(name) == 'libm.so':
+            if name and rffi.charp2str(name) == 'libm.so':
                 name = rffi.str2charp('libm.so.6', track_allocation=False)
         #
         res = c_dlopen(name, rffi.cast(rffi.INT, mode))


More information about the pypy-commit mailing list