From: Damien Grassart <damien@grassart.com>
To: ccan@lists.ozlabs.org
Subject: [PATCH 1/2] darray: Fix bug in the darray_remove() macro
Date: Sat, 26 Aug 2017 18:26:20 +0200 [thread overview]
Message-ID: <20170826162620.15989-1-damien@grassart.com> (raw)
The memmove() call should be using the index argument to determine the
number of bytes to copy.
Signed-off-by: Damien Grassart <damien@grassart.com>
---
ccan/darray/darray.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ccan/darray/darray.h b/ccan/darray/darray.h
index 75112419..8d47645b 100644
--- a/ccan/darray/darray.h
+++ b/ccan/darray/darray.h
@@ -225,7 +225,7 @@ typedef darray(unsigned long) darray_ulong;
/* Warning, slow: Requires copying all elements after removed item. */
#define darray_remove(arr, index) do { \
if (index < arr.size-1) \
- memmove(&(arr).item[index], &(arr).item[index+1], ((arr).size-1-i)*sizeof(*(arr).item)); \
+ memmove(&(arr).item[index], &(arr).item[index+1], ((arr).size-1-index)*sizeof(*(arr).item)); \
(arr).size--; \
} while(0)
--
2.14.1
_______________________________________________
ccan mailing list
ccan@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/ccan
next reply other threads:[~2017-08-26 16:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-26 16:26 Damien Grassart [this message]
2017-08-27 2:56 ` [PATCH 1/2] darray: Fix bug in the darray_remove() macro David Gibson
2017-08-27 21:02 ` Damien Grassart
2017-08-27 21:26 ` [PATCH 1/2] darray: Rename identifiers starting with an underscore Damien Grassart
2017-08-27 21:26 ` [PATCH 2/2] darray: Fix bug in the darray_remove() macro Damien Grassart
2017-08-28 2:48 ` David Gibson
2017-08-28 5:03 ` Damien Grassart
2017-08-28 5:09 ` [PATCH] " Damien Grassart
2017-08-29 4:54 ` David Gibson
2017-08-29 10:08 ` Damien Grassart
2017-08-28 2:43 ` [PATCH 1/2] darray: Rename identifiers starting with an underscore David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170826162620.15989-1-damien@grassart.com \
--to=damien@grassart.com \
--cc=ccan@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).