[Emacs-diffs] trunk r114681: * fns.c (Fstring_as_unibyte): Use xlispstrdup.

[Dmitry Antipov]

------------------------------------------------------------
revno: 114681
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-16 13:30:30 +0400
message:
  * fns.c (Fstring_as_unibyte): Use xlispstrdup.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/fns.c                      fns.c-20091113204419-o5vbwnq5f7feedwu-203

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-15 21:03:00 +0000
+++ b/src/ChangeLog     2013-10-16 09:30:30 +0000
@@ -1,3 +1,7 @@
+2013-10-16  Dmitry Antipov  <address@hidden>
+
+       * fns.c (Fstring_as_unibyte): Use xlispstrdup.
+
 2013-10-15  Paul Eggert  <address@hidden>
 
        * print.c (print_object): Print " ..." when truncating bool vectors.

=== modified file 'src/fns.c'
--- a/src/fns.c 2013-10-14 07:12:49 +0000
+++ b/src/fns.c 2013-10-16 09:30:30 +0000
@@ -1009,11 +1009,9 @@
 
   if (STRING_MULTIBYTE (string))
     {
-      ptrdiff_t bytes = SBYTES (string);
-      unsigned char *str = xmalloc (bytes);
+      unsigned char *str = xlispstrdup (string);
+      ptrdiff_t bytes = str_as_unibyte (str, SBYTES (string));
 
-      memcpy (str, SDATA (string), bytes);
-      bytes = str_as_unibyte (str, bytes);
       string = make_unibyte_string ((char *) str, bytes);
       xfree (str);
     }