Fail if libnethack is resident before dlopening.

This is the issue in #254.
facebookresearch · Feb 2, 2022 · 0c491f9 · 0c491f9
1 parent ed324b0
commit 0c491f9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/sys/unix/nledl.c b/sys/unix/nledl.c
@@ -10,7 +10,16 @@ void
 nledl_init(nledl_ctx *nledl, nle_obs *obs, nle_seeds_init_t *seed_init,
            nle_settings *settings)
 {
-    nledl->dlhandle = dlopen(nledl->dlpath, RTLD_LAZY);
+    void *handle = dlopen(nledl->dlpath, RTLD_LAZY | RTLD_NOLOAD);
+    if (handle) {
+        dlclose(handle);
+        fprintf(stderr,
+                "failure in nledl_init: library %s is already loaded\n",
+                nledl->dlpath);
+        exit(EXIT_FAILURE);
+    }
+
+    nledl->dlhandle = dlopen(nledl->dlpath, RTLD_LAZY | RTLD_FIRST);
 
     if (!nledl->dlhandle) {
         fprintf(stderr, "%s\n", dlerror());
@@ -50,7 +59,6 @@ nledl_close(nledl_ctx *nledl)
         fprintf(stderr, "Error in dlclose: %s\n", dlerror());
         exit(EXIT_FAILURE);
     }
-
     dlerror();
 }
 

diff --git a/sys/unix/rlmain.cc b/sys/unix/rlmain.cc
@@ -35,7 +35,6 @@ class ScopedTC
 void
 play(nledl_ctx *nle, nle_obs *obs, nle_settings *settings)
 {
-    char i;
     while (!obs->done) {
         for (int r = 0; r < ROWNO; ++r) {
             for (int c = 0; c < COLNO - 1; ++c)