From: Jan Djärv <jan.h.d@swipnet.se>
Date: Fri, 13 Jul 2012 17:07:02 +0000 (+0200)
Subject: * nsmenu.m (ns_update_menubar): Exchange place of argument 2 and 3 to
X-Git-Tag: emacs-24.2.90~1199^2~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b55b9f85db85737b365e32585542046b349c1f2e;p=emacs.git

* nsmenu.m (ns_update_menubar): Exchange place of argument 2 and 3 to
memcpy.

Fixes: debbugs:11907
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 9161d4c40de..e9d2d7f7d37 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-13  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsmenu.m (ns_update_menubar): Exchange place of argument 2 and 3 to
+	memcpy (Bug#11907).
+
 2012-07-13  Kalle Kankare <kalle.kankare@iki.fi> (tiny change)
 
 	* image.c (Fimagemagick_types): Initialize ex with GetExceptionInfo
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 2cd626e131a..f3bd9dd3ecb 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -448,8 +448,8 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu)
 	    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);