Merge pull request #331 from icosahedral-dragon/fix-asan-errors

Fix asan errors

Author: Interrupt

Diff for: src/GameSrc/Headers/cyber.h

@@ -48,6 +48,9 @@ errtype check_cspace_death();
 #define CYBERMINE_DAMAGE 15
 #define CYBERHEAL_QUANTITY 70
 
+// Time until SHODAN appears to kick the player out of cyberspace.
+extern uint32_t time_until_shodan_avatar;
+
 extern void (*cspace_effect_turnoff[])(uchar, uchar);
 extern ulong cspace_effect_times[NUM_CS_EFFECTS];
 extern ulong cspace_effect_durations[NUM_CS_EFFECTS];

Diff for: src/GameSrc/Headers/trigger.h

@@ -83,6 +83,7 @@ typedef struct _EmailSchedEvent {
     ushort timestamp;
     ushort type;
     short datamunge;
+    short pad; // must be at least as big as a SchedEvent
 } EmailSchedEvent;
 
 // Prototypes

Diff for: src/GameSrc/cyber.c

@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 extern uchar *shodan_bitmask;
 
 ObjID shodan_avatar_id = OBJ_NULL;
-extern uint32_t time_until_shodan_avatar;
+uint32_t time_until_shodan_avatar = 0;
 
 ObjID cspace_decoy_obj = OBJ_NULL;
 ObjLoc recall_objloc;

Diff for: src/GameSrc/gameobj.c

@@ -1071,7 +1071,7 @@ void show_obj(ObjID cobjid) {
         case FAUBJ_TPOLY:
             switch (ID2TRIP(cobjid)) {
             case TMAP_TRIPLE: {
-                extern int all_textures;
+                extern uchar all_textures;
                 tpdata = get_texture_map(objBigstuffs[_fr_cobj->specID].data2,
                                          (all_textures) ? TEXTURE_128_INDEX : TEXTURE_64_INDEX);
                 scale = -1;

Diff for: src/GameSrc/gamerend.c

@@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "tools.h"
 
+#include "cyber.h"
 #include "gamerend.h"
 #include "weapons.h"
 #include "colors.h"
@@ -664,7 +665,6 @@ uchar gamesys_draw_func(void *fake_dest_canvas, void *fake_dest_bm, int x, int y
         switch (flags & FR_OVERLAY_MASK) {
         case FR_OVERLAY_SHODAN: {
             int i;
-            extern ulong time_until_shodan_avatar;
             extern uchar *shodan_bitmask;
             extern grs_bitmap shodan_draw_fs;
             extern grs_bitmap shodan_draw_normal;

Diff for: src/GameSrc/gamesys.c

@@ -500,7 +500,6 @@ errtype gamesys_run(void) {
     }
 
     if (shodan_bitmask != NULL) {
-        extern uint32_t time_until_shodan_avatar;
         if (player_struct.game_time > time_until_shodan_avatar) {
             char i;
             if (thresh_fail) {
@@ -725,7 +724,6 @@ int apply_rate(int var, int rate, int t0, int t1, int vmin, int vmax) {
 
 #define ENERGY_VAR_RATE 50
 
-uint32_t time_until_shodan_avatar = 0;
 extern ObjID shodan_avatar_id;
 
 #define MY_FORALLOBJSPECS(pmo, objspec) \

Diff for: src/GameSrc/hud.c

@@ -28,6 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <string.h>
 #include <stdio.h>
 
+#include "cyber.h"
 #include "hud.h"
 #include "hudobj.h"
 #include "player.h"
@@ -172,7 +173,6 @@ void hud_delete_line(int i) {
 
 void compute_hud_var(HudLine *hl) {
     extern short shield_absorb_perc;
-    extern ulong time_until_shodan_avatar;
     extern void second_format(int sec_remain, char *s);
 
     char *text = hudline_text[HUDLINE_TEXT(hl)];

Diff for: src/GameSrc/mfdfunc.c

@@ -2331,7 +2331,7 @@ char *level_to_floor(int lev_num, char *buf) {
     return (buf);
 }
 
-#define NUMBER_BUFSZ 3
+#define NUMBER_BUFSZ 4 // don't forget the terminator!
 
 // if we null your panel_ref, return the value
 // before we nulled it.  Otherwise, return NULL.
@@ -2639,8 +2639,6 @@ void mfd_setup_keypad(char special) {
     mfd_notify_func(MFD_KEYPAD_FUNC, MFD_INFO_SLOT, TRUE, MFD_ACTIVE, TRUE);
 }
 
-#define NUMBER_BUFSZ 3
-
 void mfd_keypad_expose(MFD *mfd, ubyte control) {
     keypad_data_type *keypad_data = (keypad_data_type *)&player_struct.mfd_func_data[MFD_KEYPAD_FUNC][0];
     char buf[NUMBER_BUFSZ];

Diff for: src/GameSrc/trigger.c

@@ -1405,7 +1405,6 @@ grs_bitmap shodan_draw_normal;
 
 void hack_shodan_conquer_func(char c) {
     extern void begin_shodan_conquer_fx(uchar begin);
-    extern ulong time_until_shodan_avatar;
     extern char thresh_fail;
     extern uchar shodan_phase_in(uchar * bitmask, short x, short y, short w, short h, short num, uchar dir);
     shodan_bitmask = tmap_static_mem;

Diff for: src/Libraries/FIX/Source/MakeTables.c

@@ -84,10 +84,13 @@ uint16_t sintab[256+64+1] = {
 // Its units are fixangs.
 //
 // acos(x) = PI/2 - asin(x).   (PI/2 is fixang 0x4000)
+// Note that there are 130 entries in the table. The asin and acos functions
+// will use the low 8 bits to interpolate between entry i and entry i+1: if the
+// parameter is exactly 1, this will be asintab[128] and asintab[129].
 
 // indexed by (high 8 bits of (fix >> 2 + 0x4000)
 // clang-format off
-fixang asintab[128+1] = {
+fixang asintab[128+1+1] = {
 	0xc001, 0xc737, 0xca37, 0xcc87, 0xce7c, 0xd037, 0xd1ca, 0xd33d, 
 	0xd498, 0xd5e0, 0xd716, 0xd840, 0xd95d, 0xda6f, 0xdb78, 0xdc7a, 
 	0xdd73, 0xde67, 0xdf54, 0xe03c, 0xe11e, 0xe1fd, 0xe2d7, 0xe3ad, 
@@ -104,7 +107,7 @@ fixang asintab[128+1] = {
 	0x1b82, 0x1c54, 0x1d2a, 0x1e04, 0x1ee3, 0x1fc5, 0x20ad, 0x219a, 
 	0x228e, 0x2387, 0x2489, 0x2592, 0x26a4, 0x27c1, 0x28eb, 0x2a21, 
 	0x2b69, 0x2cc4, 0x2e37, 0x2fca, 0x3185, 0x337a, 0x35ca, 0x38ca, 
-	0x4000
+	0x4000, 0x4000
 };
 // clang-format on
 

Diff for: src/Libraries/FIX/Source/trigtab.h

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 extern uint16_t sintab[256 + 64 + 1];
 
-extern fixang asintab[128 + 1];
+extern fixang asintab[128 + 1 + 1];
 
 #define INTEGER_EXP_OFFSET 11
 extern uint32_t expinttab[INTEGER_EXP_OFFSET * 2 + 1];

Diff for: src/Libraries/RES/Source/lzw.c

@@ -334,11 +334,10 @@ int32_t LzwCompress(void (*f_SrcCtrl)(intptr_t srcLoc, LzwCtrl ctrl),   // func
     // the input has been exhausted.  Note that it stops adding codes to the
     // table after all of the possible codes have been defined.
 
-    while (true) {
+    while (lzwc.lzwInputCharCount < srcSize) {
         // Get next input char, if read all data then exit loop
         lzwc.character = (*f_SrcGet)();
-        if (lzwc.lzwInputCharCount++ >= srcSize)
-            break;
+        lzwc.lzwInputCharCount++;
 
         // See if string is in string table.  If it is, get the code value.
         lzwc.index = LzwFindMatch(lzwc.string_code, lzwc.character);