X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ffree.c;h=4f9a52a1873d4e64a5f399b12dddb825b0bc3a95;hp=fb45c80c7aecc65e6156180c3dc61e4db2750d17;hb=1d4d21dfb5ac43274afc125f132d196ce07f3177;hpb=7d6312518bd3a8e4cbad69b1f6b1800f7bcdf68c

diff --git a/ccan/tdb2/free.c b/ccan/tdb2/free.c
index fb45c80c..4f9a52a1 100644
--- a/ccan/tdb2/free.c
+++ b/ccan/tdb2/free.c
@@ -297,8 +297,10 @@ static int coalesce(struct tdb_context *tdb,
 		unsigned ftable, bucket;
 
 		r = tdb_access_read(tdb, end, sizeof(*r), true);
-		if (!r)
+		if (TDB_PTR_IS_ERR(r)) {
+			tdb->ecode = TDB_PTR_ERR(r);
 			goto err;
+		}
 
 		if (frec_magic(r) != TDB_FREE_MAGIC
 		    || frec_ftable(r) == TDB_FTABLE_NONE) {
@@ -443,8 +445,10 @@ again:
 		tdb_off_t next;
 
 		r = tdb_access_read(tdb, off, sizeof(*r), true);
-		if (!r)
+		if (TDB_PTR_IS_ERR(r)) {
+			tdb->ecode = TDB_PTR_ERR(r);
 			goto unlock_err;
+		}
 
 		if (frec_magic(r) != TDB_FREE_MAGIC) {
 			tdb_access_release(tdb, r);