You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/05/17 18:57:58 UTC
[2/8] 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/20820809
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/20820809
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/20820809
Branch: refs/heads/develop
Commit: 20820809069fbc4cbec5f9853b7ff123bb4ffa7c
Parents: edc9f73
Author: Vipul Rahane <vi...@runtime.io>
Authored: Thu Apr 28 19:10:17 2016 -0700
Committer: Vipul Rahane <vi...@runtime.io>
Committed: Mon May 16 14:02:28 2016 -0700
----------------------------------------------------------------------
libs/util/src/cbmem.c | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/20820809/libs/util/src/cbmem.c
----------------------------------------------------------------------
diff --git a/libs/util/src/cbmem.c b/libs/util/src/cbmem.c
index a0ac332..01988e5 100644
--- a/libs/util/src/cbmem.c
+++ b/libs/util/src/cbmem.c
@@ -166,6 +166,10 @@ cbmem_iter_next(struct cbmem *cbmem, struct cbmem_iter *iter)
}
} else {
hdr = iter->ci_cur;
+ if (!iter->ci_cur) {
+ goto err;
+ }
+
if (hdr == CBMEM_ENTRY_NEXT(iter->ci_end)) {
hdr = NULL;
} else {
@@ -173,6 +177,7 @@ cbmem_iter_next(struct cbmem *cbmem, struct cbmem_iter *iter)
}
}
+err:
return (hdr);
}