You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/05/17 20:52:00 UTC

[37/50] [abbrv] incubator-mynewt-core git commit: Fix cbmem crash

Fix cbmem crash


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/e3e4e911
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/e3e4e911
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/e3e4e911

Branch: refs/heads/master
Commit: e3e4e9117ff712d07fbcee3835e6b4ddeaf41f68
Parents: 19ccd68
Author: Vipul Rahane <vi...@runtime.io>
Authored: Mon May 16 14:47:32 2016 -0700
Committer: Vipul Rahane <vi...@runtime.io>
Committed: Mon May 16 14:47:32 2016 -0700

----------------------------------------------------------------------
 libs/util/src/cbmem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e3e4e911/libs/util/src/cbmem.c
----------------------------------------------------------------------
diff --git a/libs/util/src/cbmem.c b/libs/util/src/cbmem.c
index 01988e5..05051ae 100644
--- a/libs/util/src/cbmem.c
+++ b/libs/util/src/cbmem.c
@@ -160,7 +160,7 @@ cbmem_iter_next(struct cbmem *cbmem, struct cbmem_iter *iter)
         hdr = iter->ci_cur;
         iter->ci_cur = CBMEM_ENTRY_NEXT(iter->ci_cur);
 
-        if ((uint8_t *) iter->ci_cur == cbmem->c_buf_cur_end) {
+        if ((uint8_t *) iter->ci_cur >= cbmem->c_buf_cur_end) {
             iter->ci_cur = (struct cbmem_entry_hdr *) cbmem->c_buf;
             iter->ci_start = (struct cbmem_entry_hdr *) cbmem->c_buf;
         }