tdb2: make sure records with extra padding have a 0 byte.

[ccan] / ccan / tdb2 / tdb.c

diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c
index 4ffcebf56150bffe381018b4f401aa5503455196..42e75f9d1840b8f79875f01ac05b6637a6d9f358 100644 (file)
--- a/ccan/tdb2/tdb.c
+++ b/ccan/tdb2/tdb.c
@@ -510,6 +510,21 @@ static enum TDB_ERROR replace_data(struct tdb_context *tdb,
        return TDB_SUCCESS;
 }
 
        return TDB_SUCCESS;
 }
 

+static enum TDB_ERROR update_data(struct tdb_context *tdb,
+                                 tdb_off_t off,
+                                 struct tdb_data dbuf,
+                                 tdb_len_t extra)
+{
+       enum TDB_ERROR ecode;
+
+       ecode = tdb->methods->twrite(tdb, off, dbuf.dptr, dbuf.dsize);
+       if (ecode == TDB_SUCCESS && extra) {
+               /* Put a zero in; future versions may append other data. */
+               ecode = tdb->methods->twrite(tdb, off + dbuf.dsize, "", 1);
+       }
+       return ecode;
+}
+

 enum TDB_ERROR tdb_store(struct tdb_context *tdb,
                         struct tdb_data key, struct tdb_data dbuf, int flag)
 {
 enum TDB_ERROR tdb_store(struct tdb_context *tdb,
                         struct tdb_data key, struct tdb_data dbuf, int flag)
 {


@@ -542,11 +557,10 @@ enum TDB_ERROR tdb_store(struct tdb_context *tdb,
                                if (ecode != TDB_SUCCESS) {
                                        goto out;
                                }
                                if (ecode != TDB_SUCCESS) {
                                        goto out;
                                }

-                               ecode = tdb->methods->twrite(tdb,
-                                                            off + sizeof(rec)
-                                                            + key.dsize,
-                                                            dbuf.dptr,
-                                                            dbuf.dsize);
+                               ecode = update_data(tdb,
+                                                   off + sizeof(rec)
+                                                   + key.dsize, dbuf,
+                                                   old_room - dbuf.dsize);

                                if (ecode != TDB_SUCCESS) {
                                        goto out;
                                }
                                if (ecode != TDB_SUCCESS) {
                                        goto out;
                                }


@@ -602,8 +616,8 @@ enum TDB_ERROR tdb_append(struct tdb_context *tdb,
                        }
 
                        off += sizeof(rec) + key.dsize + old_dlen;
                        }
 
                        off += sizeof(rec) + key.dsize + old_dlen;

-                       ecode = tdb->methods->twrite(tdb, off, dbuf.dptr,
-                                                    dbuf.dsize);
+                       ecode = update_data(tdb, off, dbuf,
+                                           rec_extra_padding(&rec));

                        goto out;
                }
 
                        goto out;
                }