2 files changed, 7 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 169f0e4a673..75333b7160f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2012-06-27  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        * alloc.c (allocate_string): Omit intervals initialization.
+        * alloc.c (make_uninit_multibyte_string): Initialize intervals
+        as in make_pure_string and make_pure_c_string.
+
+2012-06-27  Dmitry Antipov  <dmantipov@yandex.ru>
+
         * alloc.c (allocate_string):  Fix last change.
 
 2012-06-27  Dmitry Antipov  <dmantipov@yandex.ru>
diff --git a/src/alloc.c b/src/alloc.c
index 8111487ace2..a16e3a6d83f 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1959,10 +1959,6 @@ allocate_string (void)
 
   MALLOC_UNBLOCK_INPUT;
 
-  /* SIZE and SIZE_BYTE fields will be initialized
-     by calling allocate_string_data.  */
-  s->intervals = NULL_INTERVAL;
-
   --total_free_strings;
   ++total_strings;
   ++strings_consed;
@@ -2529,6 +2525,7 @@ make_uninit_multibyte_string (EMACS_INT nchars, EMACS_INT nbytes)
     return empty_multibyte_string;
 
   s = allocate_string ();
+  s->intervals = NULL_INTERVAL;
   allocate_string_data (s, nchars, nbytes);
   XSETSTRING (string, s);
   string_chars_consed += nbytes;