From 664c47fe3cf96680a29d7ee25e704cf6dd0f271c Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 9 Feb 2019 19:54:29 +1100 Subject: [PATCH] Have initialize zero private_impl but not _data --- cmd/wuffs-c/internal/cgen/cgen.go | 2 +- release/c/wuffs-unsupported-snapshot.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index 59348ff0..cc6fb034 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -982,7 +982,7 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error { b.writes("return wuffs_base__error__bad_wuffs_version;\n") b.writes("}\n") b.writes("if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) {\n") - b.writes("memset(self, 0, sizeof_star_self);\n") + b.writes("memset(&(self->private_impl), 0, sizeof(self->private_impl));\n") b.writes("} else if (self->private_impl.magic != 0) {\n") b.writes("return wuffs_base__error__initialize_falsely_claimed_already_zeroed;\n") b.writes("}\n") diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index f59760c9..e4fd3f61 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -4963,7 +4963,7 @@ wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self, return wuffs_base__error__bad_wuffs_version; } if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) { - memset(self, 0, sizeof_star_self); + memset(&(self->private_impl), 0, sizeof(self->private_impl)); } else if (self->private_impl.magic != 0) { return wuffs_base__error__initialize_falsely_claimed_already_zeroed; } @@ -5962,7 +5962,7 @@ wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self, return wuffs_base__error__bad_wuffs_version; } if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) { - memset(self, 0, sizeof_star_self); + memset(&(self->private_impl), 0, sizeof(self->private_impl)); } else if (self->private_impl.magic != 0) { return wuffs_base__error__initialize_falsely_claimed_already_zeroed; } @@ -6240,7 +6240,7 @@ wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self, return wuffs_base__error__bad_wuffs_version; } if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) { - memset(self, 0, sizeof_star_self); + memset(&(self->private_impl), 0, sizeof(self->private_impl)); } else if (self->private_impl.magic != 0) { return wuffs_base__error__initialize_falsely_claimed_already_zeroed; } @@ -8023,7 +8023,7 @@ wuffs_lzw__decoder__initialize(wuffs_lzw__decoder* self, return wuffs_base__error__bad_wuffs_version; } if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) { - memset(self, 0, sizeof_star_self); + memset(&(self->private_impl), 0, sizeof(self->private_impl)); } else if (self->private_impl.magic != 0) { return wuffs_base__error__initialize_falsely_claimed_already_zeroed; } @@ -8599,7 +8599,7 @@ wuffs_gif__decoder__initialize(wuffs_gif__decoder* self, return wuffs_base__error__bad_wuffs_version; } if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) { - memset(self, 0, sizeof_star_self); + memset(&(self->private_impl), 0, sizeof(self->private_impl)); } else if (self->private_impl.magic != 0) { return wuffs_base__error__initialize_falsely_claimed_already_zeroed; } @@ -10759,7 +10759,7 @@ wuffs_gzip__decoder__initialize(wuffs_gzip__decoder* self, return wuffs_base__error__bad_wuffs_version; } if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) { - memset(self, 0, sizeof_star_self); + memset(&(self->private_impl), 0, sizeof(self->private_impl)); } else if (self->private_impl.magic != 0) { return wuffs_base__error__initialize_falsely_claimed_already_zeroed; } @@ -11232,7 +11232,7 @@ wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self, return wuffs_base__error__bad_wuffs_version; } if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) { - memset(self, 0, sizeof_star_self); + memset(&(self->private_impl), 0, sizeof(self->private_impl)); } else if (self->private_impl.magic != 0) { return wuffs_base__error__initialize_falsely_claimed_already_zeroed; }