summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Helleu <flashcode@flashtux.org>2014-08-27 07:34:54 +0200
committerSébastien Helleu <flashcode@flashtux.org>2014-08-27 07:34:54 +0200
commit9fe6ce1cdc9e66bfbc94fc2fd1b445fe07d75149 (patch)
tree1a07150882631bbfcac90de479b5599f16dc959b
parentbf723ba7bf0b45609f94c23b0ac9436de0c1162a (diff)
downloadweechat-9fe6ce1cdc9e66bfbc94fc2fd1b445fe07d75149.zip
api: fix bug in function hdata_move when absolute value of count is greater than 1
-rw-r--r--ChangeLog.asciidoc2
-rw-r--r--src/core/wee-hdata.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index b907b1734..e3521cb81 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -26,6 +26,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* core: fix modifier "weechat_print": discard only one line when several lines
are displayed in same message (closes #171)
* core: fix translation of message displayed after /upgrade
+* api: fix bug in function hdata_move when absolute value of count is greater
+ than 1
* tests: fix build of tests when the build directory is outside source tree
(closes #178)
* tests: fix memory leak in tests launcher
diff --git a/src/core/wee-hdata.c b/src/core/wee-hdata.c
index a96956ebb..cd42d7203 100644
--- a/src/core/wee-hdata.c
+++ b/src/core/wee-hdata.c
@@ -562,11 +562,11 @@ hdata_move (struct t_hdata *hdata, void *pointer, int count)
for (i = 0; i < abs_count; i++)
{
pointer = hdata_pointer (hdata, pointer, ptr_var);
- if (pointer)
- return pointer;
+ if (!pointer)
+ break;
}
- return NULL;
+ return pointer;
}
/*