@@ -1162,7 +1162,7 @@ int bdrv_commit(BlockDriverState *bs)
int n, ro, open_flags;
int ret = 0, rw_ret = 0;
uint8_t *buf;
- char filename[1024];
+ char filename[PATH_MAX];
BlockDriverState *bs_rw, *bs_ro;
if (!drv)
@@ -1182,7 +1182,8 @@ int bdrv_commit(BlockDriverState *bs)
backing_drv = bs->backing_hd->drv;
ro = bs->backing_hd->read_only;
- strncpy(filename, bs->backing_hd->filename, sizeof(filename));
+ /* Use pstrcpy (not strncpy): filename must be NUL-terminated. */
+ pstrcpy(filename, sizeof(filename), bs->backing_hd->filename);
open_flags = bs->backing_hd->open_flags;
if (ro) {