[Rdesktop-commits] SF.net SVN: rdesktop:[1554] rdesktop/trunk/ewmhints.c

[<as...@us...>]

Revision: 1554
          http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1554&view=rev
Author:   astrand
Date:     2010-01-18 08:02:24 +0000 (Mon, 18 Jan 2010)

Log Message:
-----------
Adjusted incorrect memcpy line in ewmh_del_icon, as suggested by
#1970489. 

Modified Paths:
--------------
    rdesktop/trunk/ewmhints.c

Modified: rdesktop/trunk/ewmhints.c
===================================================================
--- rdesktop/trunk/ewmhints.c	2010-01-18 07:53:37 UTC (rev 1553)
+++ rdesktop/trunk/ewmhints.c	2010-01-18 08:02:24 UTC (rev 1554)
@@ -520,8 +520,8 @@
 	if (i != 0)
 		memcpy(new_set, cur_set, i * sizeof(unsigned long));
 	if (i != nitems - icon_size)
-		memcpy(new_set + i * sizeof(unsigned long),
-		       cur_set + i * sizeof(unsigned long) + icon_size, nitems - icon_size);
+		memcpy(new_set + i, cur_set + i + icon_size,
+		       (nitems - (i + icon_size)) * sizeof(unsigned long));
 
 	nitems -= icon_size;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.