Hi Nick.
This also fixes a use-after-free (well, free-before-initialization)
and a bug that leads to an accidentally different file format on
platforms where int is not 32 bits wide.
The last two patches are new or changed in this version. (Unchanged
patches are not denoted v2.)
I just pushed these fixes on your behalf.
Salud!