[geany/geany] 2f94aa: Fix incomplete copy in tm_tags_merge() that lead to crashes

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Fri, 25 May 2012 17:44:17
Commit:      2f94aa373e4329dc6d3f103f21333c4e08e95355
             https://github.com/geany/geany/commit/2f94aa373e4329dc6d3f103f21333c4e08e95355

Log Message:
-----------
Fix incomplete copy in tm_tags_merge() that lead to crashes


Modified Paths:
--------------
    tagmanager/tm_tag.c

Modified: tagmanager/tm_tag.c
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -600,7 +600,7 @@ gboolean tm_tags_merge(GPtrArray *tags_array, gsize orig_len,
 		tags_array->pdata[i] = (cmp >= 0) ? *a-- : *b--;
 		if (a < tags_array->pdata)
 		{
-			memcpy(tags_array->pdata, copy, b - copy);
+			memcpy(tags_array->pdata, copy, (b - copy) * sizeof(gpointer));
 			break;
 		}
 		if (b < copy)


@@ Diff output truncated at 100000 characters. @@


--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).