Branch: refs/heads/master Author: Nick Treleaven nick.treleaven@btinternet.com Committer: Nick Treleaven nick.treleaven@btinternet.com Date: Sun, 27 May 2012 16:20:34 Commit: ffd3d739db23c2da70faf960bc060e4a3e29c4ae https://github.com/geany/geany/commit/ffd3d739db23c2da70faf960bc060e4a3e29c4...
Log Message: ----------- Fix a missing tag on global tags merge (oops)
Modified Paths: -------------- tagmanager/tm_tag.c
Modified: tagmanager/tm_tag.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -600,7 +600,8 @@ 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) * sizeof(gpointer)); + /* include remainder of copy as well as current value of b */ + memcpy(tags_array->pdata, copy, ((b + 1) - 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).