From bee14a6df7100de5d68c1b53fc820c98eb9123cb Mon Sep 17 00:00:00 2001 From: Dale Weiler Date: Wed, 14 Aug 2013 07:19:49 +0000 Subject: [PATCH] Some bug fixes --- ir.c | 4 ++-- pak.c | 55 +++++++++++++++++++++++-------------------- parser.c | 1 + test.c | 7 ++++-- util.c | 72 +++++++++++++++++++++++--------------------------------- 5 files changed, 66 insertions(+), 73 deletions(-) diff --git a/ir.c b/ir.c index 2d55ce0..ee07a44 100644 --- a/ir.c +++ b/ir.c @@ -434,7 +434,7 @@ ir_value* ir_builder_create_global(ir_builder *self, const char *name, int vtype { ir_value *ve; - if (name && name[0] != '#') + if (name[0] != '#') { ve = ir_builder_get_global(self, name); if (ve) { @@ -3386,7 +3386,7 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc pushdef = false; } - if (pushdef && global->name) { + if (pushdef) { if (global->name[0] == '#') { if (!self->str_immediate) self->str_immediate = code_genstring(self->code, "IMMEDIATE"); diff --git a/pak.c b/pak.c index 5cece63..abb389b 100644 --- a/pak.c +++ b/pak.c @@ -266,15 +266,14 @@ static bool pak_extract_one(pak_file_t *pak, const char *file, const char *outdi pak_directory_t *dir = NULL; unsigned char *dat = NULL; char *local = NULL; - FILE *out; + FILE *out = NULL; if (!pak_exists(pak, file, &dir)) { return false; } - if (!(dat = (unsigned char *)mem_a(dir->len))) { - return false; - } + if (!(dat = (unsigned char *)mem_a(dir->len))) + goto err; /* * Generate the directory structure / tree that will be required @@ -289,28 +288,27 @@ static bool pak_extract_one(pak_file_t *pak, const char *file, const char *outdi * Now create the file, if this operation fails. Then abort * It shouldn't fail though. */ - if (!(out = fs_file_open(local, "wb"))) { - mem_d(dat); - return false; - } + if (!(out = fs_file_open(local, "wb"))) + goto err; /* free memory for directory string */ mem_d(local); /* read */ - fs_file_seek (pak->handle, dir->pos, SEEK_SET); - fs_file_read (dat, 1, dir->len, pak->handle); + if (fs_file_seek (pak->handle, dir->pos, SEEK_SET) != 0) + goto err; - /* write */ + fs_file_read (dat, 1, dir->len, pak->handle); fs_file_write(dat, 1, dir->len, out); - - /* close */ fs_file_close(out); - /* free */ mem_d(dat); - return true; + +err: + if (dat) mem_d(dat); + if (out) fs_file_close(out); + return false; } static bool pak_extract_all(pak_file_t *pak, const char *dir) { @@ -353,8 +351,7 @@ static bool pak_insert_one(pak_file_t *pak, const char *file) { * the directory entry, and the actual contents of the file * to the PAK file itself. */ - fs_file_seek(fp, 0, SEEK_END); - if ((len = fs_file_tell(fp)) < 0) { + if (fs_file_seek(fp, 0, SEEK_END) != 0 || ((len = fs_file_tell(fp)) < 0)) { fs_file_close(fp); return false; } @@ -423,6 +420,7 @@ bool pak_insert_all(pak_file_t *pak, const char *dir) { static bool pak_close(pak_file_t *pak) { size_t itr; + long tell; if (!pak) return false; @@ -432,23 +430,21 @@ static bool pak_close(pak_file_t *pak) { * our directory entries at the end of the file. */ if (pak->insert) { - int tell = fs_file_tell(pak->handle); - if (tell < 0) { - vec_free (pak->directories); - fs_file_close(pak->handle); - mem_d (pak); + if ((tell = fs_file_tell(pak->handle)) != 0) + goto err; - return false; - } pak->header.dirlen = vec_size(pak->directories) * 64; pak->header.diroff = tell; /* patch header */ - fs_file_seek (pak->handle, 0, SEEK_SET); + if (fs_file_seek (pak->handle, 0, SEEK_SET) != 0) + goto err; + fs_file_write(&(pak->header), sizeof(pak_header_t), 1, pak->handle); /* write directories */ - fs_file_seek (pak->handle, pak->header.diroff, SEEK_SET); + if (fs_file_seek (pak->handle, pak->header.diroff, SEEK_SET) != 0) + goto err; for (itr = 0; itr < vec_size(pak->directories); itr++) { fs_file_write(&(pak->directories[itr]), sizeof(pak_directory_t), 1, pak->handle); @@ -460,6 +456,13 @@ static bool pak_close(pak_file_t *pak) { mem_d (pak); return true; + +err: + vec_free (pak->directories); + fs_file_close(pak->handle); + mem_d (pak); + + return false; } /* diff --git a/parser.c b/parser.c index 9b7c75d..1c453f3 100644 --- a/parser.c +++ b/parser.c @@ -741,6 +741,7 @@ static bool parser_sy_apply_operator(parser_t *parser, shunt *sy) compile_error(ast_ctx(exprs[0]), "Not Yet Implemented: bit-shifts"); return false; } + break; case opid2('|','|'): generated_op += 1; /* INSTR_OR */ diff --git a/test.c b/test.c index 629a10e..1e303fd 100644 --- a/test.c +++ b/test.c @@ -689,9 +689,12 @@ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) { */ while ((files = fs_dir_read(dir))) { util_asprintf(&claim, "%s/%s", curdir, files->d_name); - if (stat(claim, &directory) == -1) + if (stat(claim, &directory) == -1) { + fs_dir_close(dir); + mem_d(claim); return false; - + } + if (S_ISDIR(directory.st_mode) && files->d_name[0] != '.') { vec_push(directories, claim); } else { diff --git a/util.c b/util.c index 7d6e034..48977da 100644 --- a/util.c +++ b/util.c @@ -163,49 +163,35 @@ void util_endianswap(void *_data, size_t length, unsigned int typesize) { */ static const uint16_t util_crc16_table[] = { - 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, - 0x60C6, 0x70E7, 0x8108, 0x9129, 0xA14A, 0xB16B, - 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF, 0x1231, 0x0210, - 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6, - 0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, - 0xF3FF, 0xE3DE, 0x2462, 0x3443, 0x0420, 0x1401, - 0x64E6, 0x74C7, 0x44A4, 0x5485, 0xA56A, 0xB54B, - 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D, - 0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, - 0x5695, 0x46B4, 0xB75B, 0xA77A, 0x9719, 0x8738, - 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC, 0x48C4, 0x58E5, - 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823, - 0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, - 0xA90A, 0xB92B, 0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, - 0x1A71, 0x0A50, 0x3A33, 0x2A12, 0xDBFD, 0xCBDC, - 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A, - 0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, - 0x0C60, 0x1C41, 0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, - 0xAD2A, 0xBD0B, 0x8D68, 0x9D49, 0x7E97, 0x6EB6, - 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70, - 0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, - 0x9F59, 0x8F78, 0x9188, 0x81A9, 0xB1CA, 0xA1EB, - 0xD10C, 0xC12D, 0xF14E, 0xE16F, 0x1080, 0x00A1, - 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067, - 0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, - 0xE37F, 0xF35E, 0x02B1, 0x1290, 0x22F3, 0x32D2, - 0x4235, 0x5214, 0x6277, 0x7256, 0xB5EA, 0xA5CB, - 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D, - 0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, - 0x5424, 0x4405, 0xA7DB, 0xB7FA, 0x8799, 0x97B8, - 0xE75F, 0xF77E, 0xC71D, 0xD73C, 0x26D3, 0x36F2, - 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634, - 0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, - 0xB98A, 0xA9AB, 0x5844, 0x4865, 0x7806, 0x6827, - 0x18C0, 0x08E1, 0x3882, 0x28A3, 0xCB7D, 0xDB5C, - 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A, - 0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, - 0x2AB3, 0x3A92, 0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, - 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9, 0x7C26, 0x6C07, - 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1, - 0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, - 0x8FD9, 0x9FF8, 0x6E17, 0x7E36, 0x4E55, 0x5E74, - 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0 + 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7, 0x8108, + 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF, 0x1231, 0x0210, + 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6, 0x9339, 0x8318, 0xB37B, + 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE, 0x2462, 0x3443, 0x0420, 0x1401, + 0x64E6, 0x74C7, 0x44A4, 0x5485, 0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, + 0xF5CF, 0xC5AC, 0xD58D, 0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, + 0x5695, 0x46B4, 0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, + 0xC7BC, 0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823, + 0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B, 0x5AF5, + 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12, 0xDBFD, 0xCBDC, + 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A, 0x6CA6, 0x7C87, 0x4CE4, + 0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41, 0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, + 0xAD2A, 0xBD0B, 0x8D68, 0x9D49, 0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, + 0x2E32, 0x1E51, 0x0E70, 0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, + 0x9F59, 0x8F78, 0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, + 0xE16F, 0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067, + 0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E, 0x02B1, + 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256, 0xB5EA, 0xA5CB, + 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D, 0x34E2, 0x24C3, 0x14A0, + 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, 0xA7DB, 0xB7FA, 0x8799, 0x97B8, + 0xE75F, 0xF77E, 0xC71D, 0xD73C, 0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, + 0x7676, 0x4615, 0x5634, 0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, + 0xB98A, 0xA9AB, 0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, + 0x28A3, 0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A, + 0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92, 0xFD2E, + 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9, 0x7C26, 0x6C07, + 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1, 0xEF1F, 0xFF3E, 0xCF5D, + 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8, 0x6E17, 0x7E36, 0x4E55, 0x5E74, + 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0 }; /* Non - Reflected */ -- 2.39.2