From: Philipp Stephani <phst@google.com>
Date: Sun, 9 Jul 2017 22:28:50 +0000 (+0200)
Subject: Re-add a useful assertion
X-Git-Tag: emacs-26.0.90~518^2~135
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=81131ff26fe2a36c2ed0a4853d85af3bcb8bbdb1;p=emacs.git

Re-add a useful assertion

* src/emacs-module.c (module_free_global_ref): Re-add assertion that
the reference count is zero.  This assertion was removed in commit
8afaa1321f8088bfb877fe4b6676e8517adb0bb7, but it's not included in the
test performed by XFASTINT before, because the previous reference
count could have been zero already in the case of a buggy
implementation.  This assertion might have detected Bug#27587.
---

diff --git a/src/emacs-module.c b/src/emacs-module.c
index ba996982604..7e0ba3c16c1 100644
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -328,7 +328,10 @@ module_free_global_ref (emacs_env *env, emacs_value ref)
           set_hash_value_slot (h, i, value);
         }
       else
-	hash_remove_from_table (h, obj);
+        {
+          eassert (refcount == 0);
+          hash_remove_from_table (h, obj);
+        }
     }
 
   if (module_assertions)