[Emacs-diffs] /srv/bzr/emacs/trunk r109077: * nsmenu.m (ns_update_menubar): Exchange place of argument 2 and 3 to

[Jan D.]

------------------------------------------------------------
revno: 109077
fixes bug: http://debbugs.gnu.org/11907
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2012-07-13 19:07:02 +0200
message:
  * nsmenu.m (ns_update_menubar): Exchange place of argument 2 and 3 to
  memcpy.
modified:
  src/ChangeLog
  src/nsmenu.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-13 12:20:07 +0000
+++ b/src/ChangeLog     2012-07-13 17:07:02 +0000
@@ -1,3 +1,8 @@
+2012-07-13  Jan Djärv  <address@hidden>
+
+       * nsmenu.m (ns_update_menubar): Exchange place of argument 2 and 3 to
+       memcpy (Bug#11907).
+
 2012-07-13  Kalle Kankare <address@hidden> (tiny change)
 
        * image.c (Fimagemagick_types): Initialize ex with GetExceptionInfo

=== modified file 'src/nsmenu.m'
--- a/src/nsmenu.m      2012-07-10 21:48:34 +0000
+++ b/src/nsmenu.m      2012-07-13 17:07:02 +0000
@@ -448,8 +448,8 @@
            break;
 
           if (n < 100)
-           memcpy (previous_strings[i/4], min (10, SBYTES (string) + 1),
-                   SDATA (string));
+           memcpy (previous_strings[i/4], SDATA (string),
+                    min (10, SBYTES (string) + 1));
 
          wv = xmalloc_widget_value ();
          wv->name = SSDATA (string);