mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-22 16:47:28 +01:00
Generate C code to check for NULL args.
This commit is contained in:
1 parent
4c0a659a18
commit
3d2040d71a
4 files changed
+65
-21
No files matched your search
+32
-6
@@ -96,10 +96,11 @@ func (g *gen) generate() error {
|
|||||||
g.writes("typedef enum {\n")
|
g.writes("typedef enum {\n")
|
||||||
g.printf("puffs_%s_status_ok = 0,\n", g.pkgName)
|
g.printf("puffs_%s_status_ok = 0,\n", g.pkgName)
|
||||||
g.printf("puffs_%s_error_bad_version = -2 + 1,\n", g.pkgName)
|
g.printf("puffs_%s_error_bad_version = -2 + 1,\n", g.pkgName)
|
||||||
g.printf("puffs_%s_error_null_receiver = -4 + 1,\n", g.pkgName)
|
g.printf("puffs_%s_error_bad_receiver = -4 + 1,\n", g.pkgName)
|
||||||
g.printf("puffs_%s_error_constructor_not_called= -6 + 1,\n", g.pkgName)
|
g.printf("puffs_%s_error_bad_argument = -6 + 1,\n", g.pkgName)
|
||||||
g.printf("puffs_%s_status_short_dst = -8,\n", g.pkgName)
|
g.printf("puffs_%s_error_constructor_not_called= -8 + 1,\n", g.pkgName)
|
||||||
g.printf("puffs_%s_status_short_src = -10,\n", g.pkgName)
|
g.printf("puffs_%s_status_short_dst = -10,\n", g.pkgName)
|
||||||
|
g.printf("puffs_%s_status_short_src = -12,\n", g.pkgName)
|
||||||
g.printf("} puffs_%s_status;\n\n", g.pkgName)
|
g.printf("} puffs_%s_status;\n\n", g.pkgName)
|
||||||
|
|
||||||
g.writes("// ---------------- Public Structs\n\n")
|
g.writes("// ---------------- Public Structs\n\n")
|
||||||
@@ -339,7 +340,7 @@ func (g *gen) writeFuncImpl(n *a.Func) error {
|
|||||||
// Check the previous status and the args.
|
// Check the previous status and the args.
|
||||||
if n.Public() {
|
if n.Public() {
|
||||||
if n.Receiver() != 0 {
|
if n.Receiver() != 0 {
|
||||||
g.printf("if (!self) { return puffs_%s_error_null_receiver; }\n", g.pkgName)
|
g.printf("if (!self) { return puffs_%s_error_bad_receiver; }\n", g.pkgName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if n.Suspendible() {
|
if n.Suspendible() {
|
||||||
@@ -362,7 +363,32 @@ func (g *gen) writeFuncImpl(n *a.Func) error {
|
|||||||
return fmt.Errorf(`cannot convert Puffs function "%s.%s" to C`,
|
return fmt.Errorf(`cannot convert Puffs function "%s.%s" to C`,
|
||||||
r.String(g.idMap), n.Name().String(g.idMap))
|
r.String(g.idMap), n.Name().String(g.idMap))
|
||||||
}
|
}
|
||||||
// TODO: check the args.
|
if n.Public() {
|
||||||
|
badArg := false
|
||||||
|
for _, o := range n.In().Fields() {
|
||||||
|
o := o.Field()
|
||||||
|
if o.XType().PackageOrDecorator().Key() != t.KeyPtr {
|
||||||
|
// TODO: check for type refinements: u32[..4095] instead of
|
||||||
|
// u32. Also check for types, for array-typed arguments.
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if badArg {
|
||||||
|
g.writes(" || ")
|
||||||
|
} else {
|
||||||
|
g.writes("if (")
|
||||||
|
}
|
||||||
|
g.printf("!a_%s", o.Name().String(g.idMap))
|
||||||
|
badArg = true
|
||||||
|
}
|
||||||
|
if badArg {
|
||||||
|
g.writes(") {")
|
||||||
|
if n.Suspendible() {
|
||||||
|
g.printf("status = puffs_%s_error_bad_argument; goto cleanup0; }\n", g.pkgName)
|
||||||
|
} else {
|
||||||
|
g.printf("return puffs_%s_error_bad_argument; }\n", g.pkgName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
g.writes("\n")
|
g.writes("\n")
|
||||||
|
|
||||||
// Generate the local variables.
|
// Generate the local variables.
|
||||||
|
|||||||
+10
-5
@@ -57,10 +57,11 @@ extern "C" {
|
|||||||
typedef enum {
|
typedef enum {
|
||||||
puffs_gif_status_ok = 0,
|
puffs_gif_status_ok = 0,
|
||||||
puffs_gif_error_bad_version = -2 + 1,
|
puffs_gif_error_bad_version = -2 + 1,
|
||||||
puffs_gif_error_null_receiver = -4 + 1,
|
puffs_gif_error_bad_receiver = -4 + 1,
|
||||||
puffs_gif_error_constructor_not_called = -6 + 1,
|
puffs_gif_error_bad_argument = -6 + 1,
|
||||||
puffs_gif_status_short_dst = -8,
|
puffs_gif_error_constructor_not_called = -8 + 1,
|
||||||
puffs_gif_status_short_src = -10,
|
puffs_gif_status_short_dst = -10,
|
||||||
|
puffs_gif_status_short_src = -12,
|
||||||
} puffs_gif_status;
|
} puffs_gif_status;
|
||||||
|
|
||||||
// ---------------- Public Structs
|
// ---------------- Public Structs
|
||||||
@@ -161,7 +162,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
|
|||||||
puffs_base_buf1* a_src,
|
puffs_base_buf1* a_src,
|
||||||
bool a_src_final) {
|
bool a_src_final) {
|
||||||
if (!self) {
|
if (!self) {
|
||||||
return puffs_gif_error_null_receiver;
|
return puffs_gif_error_bad_receiver;
|
||||||
}
|
}
|
||||||
puffs_gif_status status = self->status;
|
puffs_gif_status status = self->status;
|
||||||
if (status & 1) {
|
if (status & 1) {
|
||||||
@@ -171,6 +172,10 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
|
|||||||
status = puffs_gif_error_constructor_not_called;
|
status = puffs_gif_error_constructor_not_called;
|
||||||
goto cleanup0;
|
goto cleanup0;
|
||||||
}
|
}
|
||||||
|
if (!a_dst || !a_src) {
|
||||||
|
status = puffs_gif_error_bad_argument;
|
||||||
|
goto cleanup0;
|
||||||
|
}
|
||||||
|
|
||||||
uint32_t v_bits;
|
uint32_t v_bits;
|
||||||
uint32_t v_n_bits;
|
uint32_t v_n_bits;
|
||||||
|
|||||||
+5
-4
@@ -57,10 +57,11 @@ extern "C" {
|
|||||||
typedef enum {
|
typedef enum {
|
||||||
puffs_gif_status_ok = 0,
|
puffs_gif_status_ok = 0,
|
||||||
puffs_gif_error_bad_version = -2 + 1,
|
puffs_gif_error_bad_version = -2 + 1,
|
||||||
puffs_gif_error_null_receiver = -4 + 1,
|
puffs_gif_error_bad_receiver = -4 + 1,
|
||||||
puffs_gif_error_constructor_not_called = -6 + 1,
|
puffs_gif_error_bad_argument = -6 + 1,
|
||||||
puffs_gif_status_short_dst = -8,
|
puffs_gif_error_constructor_not_called = -8 + 1,
|
||||||
puffs_gif_status_short_src = -10,
|
puffs_gif_status_short_dst = -10,
|
||||||
|
puffs_gif_status_short_src = -12,
|
||||||
} puffs_gif_status;
|
} puffs_gif_status;
|
||||||
|
|
||||||
// ---------------- Public Structs
|
// ---------------- Public Structs
|
||||||
|
|||||||
+18
-6
@@ -24,19 +24,30 @@ void test_constructor_not_called() {
|
|||||||
puffs_gif_status status =
|
puffs_gif_status status =
|
||||||
puffs_gif_lzw_decoder_decode(&dec, &dst, &src, false);
|
puffs_gif_lzw_decoder_decode(&dec, &dst, &src, false);
|
||||||
if (status != puffs_gif_error_constructor_not_called) {
|
if (status != puffs_gif_error_constructor_not_called) {
|
||||||
FAIL("test_null_receiver: status: got %d, want %d", status,
|
FAIL("test_constructor_not_called: status: got %d, want %d", status,
|
||||||
puffs_gif_error_constructor_not_called);
|
puffs_gif_error_constructor_not_called);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void test_null_receiver() {
|
void test_bad_argument() {
|
||||||
|
puffs_gif_lzw_decoder dec;
|
||||||
|
puffs_gif_lzw_decoder_constructor(&dec, PUFFS_VERSION, 0);
|
||||||
|
puffs_gif_status status =
|
||||||
|
puffs_gif_lzw_decoder_decode(&dec, NULL, NULL, false);
|
||||||
|
if (status != puffs_gif_error_bad_argument) {
|
||||||
|
FAIL("test_bad_argument: status: got %d, want %d", status,
|
||||||
|
puffs_gif_error_bad_argument);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void test_bad_receiver() {
|
||||||
puffs_base_buf1 dst = {0};
|
puffs_base_buf1 dst = {0};
|
||||||
puffs_base_buf1 src = {0};
|
puffs_base_buf1 src = {0};
|
||||||
puffs_gif_status status =
|
puffs_gif_status status =
|
||||||
puffs_gif_lzw_decoder_decode(NULL, &dst, &src, false);
|
puffs_gif_lzw_decoder_decode(NULL, &dst, &src, false);
|
||||||
if (status != puffs_gif_error_null_receiver) {
|
if (status != puffs_gif_error_bad_receiver) {
|
||||||
FAIL("test_null_receiver: status: got %d, want %d", status,
|
FAIL("test_bad_receiver: status: got %d, want %d", status,
|
||||||
puffs_gif_error_null_receiver);
|
puffs_gif_error_bad_receiver);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,7 +83,8 @@ cleanup0:
|
|||||||
// The empty comments forces clang-format to place one element per line.
|
// The empty comments forces clang-format to place one element per line.
|
||||||
test tests[] = {
|
test tests[] = {
|
||||||
test_constructor_not_called, //
|
test_constructor_not_called, //
|
||||||
test_null_receiver, //
|
test_bad_argument, //
|
||||||
|
test_bad_receiver, //
|
||||||
test_puffs_version_bad, //
|
test_puffs_version_bad, //
|
||||||
test_puffs_version_good, //
|
test_puffs_version_good, //
|
||||||
NULL, //
|
NULL, //
|
||||||
|
|||||||
Reference in new issue
Block a user