Really fix bug #11519, by fixing the last change in ralloc.c.

 src/ralloc.c (r_alloc_inhibit_buffer_relocation): Fix stupid thinko
 in the logic of incrementing and decrementing the value of
 use_relocatable_buffers.

diff --git a/src/ChangeLog b/src/ChangeLog
index e5d77d66b0c16f8a6057aec0d8d25e8974044a32..557a844c8f1c44c362700c5327cf322ffdaad72c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-23  Eli Zaretskii  <eliz@gnu.org>
+
+       * ralloc.c (r_alloc_inhibit_buffer_relocation): Fix stupid thinko
+       in the logic of incrementing and decrementing the value of
+       use_relocatable_buffers.
+
 2012-06-23  Paul Eggert  <eggert@cs.ucla.edu>
 
        * sysdep.c [__FreeBSD__]: Fix recently-introduced typos.

diff --git a/src/ralloc.c b/src/ralloc.c
index 19d15664eec28c493b28784ad50ffe6273ed0fec..0d8bcaf4ffbaab5bea19d36c1f594297f39295d0 100644 (file)
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -741,7 +741,7 @@ r_alloc_sbrk (long int size)
   if (! r_alloc_initialized)
     r_alloc_init ();
 
-  if (! use_relocatable_buffers)
+  if (use_relocatable_buffers <= 0)
     return (*real_morecore) (size);
 
   if (size == 0)
@@ -1142,12 +1142,12 @@ r_alloc_reset_variable (POINTER *old, POINTER *new)
 void
 r_alloc_inhibit_buffer_relocation (int inhibit)
 {
-  if (use_relocatable_buffers < 0)
-    use_relocatable_buffers = 0;
+  if (use_relocatable_buffers > 1)
+    use_relocatable_buffers = 1;
   if (inhibit)
-    use_relocatable_buffers++;
-  else if (use_relocatable_buffers > 0)
     use_relocatable_buffers--;
+  else if (use_relocatable_buffers < 1)
+    use_relocatable_buffers++;
 }
 
 \f