Fix possible issue with aOnTicks range

change to comparison to catch out of range input. Change to gawk for size check for consistency.
FlorentFlament · Feb 17, 2019 · 2a33b69 · 2a33b69
1 parent a695298
commit 2a33b69
Show file tree

Hide file tree

Showing 3 changed files with 106 additions and 106 deletions.
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ build/%.rel: src/%.c src/%.h doall
 main: $(OBJ)
 	$(SDCC) -o build/ src/$@.c $(SDCCOPTS) $^
 	cp build/$@.ihx $@.hex
-	awk -f lastadr.awk main.hex
+	gawk -f lastadr.awk main.hex
 
 clean:
 	rm -f *.ihx *.hex *.bin

diff --git a/main.hex b/main.hex
@@ -2,12 +2,12 @@
 :03000B000202F3FB
 :03006A0002000E83
 :03000E0002006D80
-:20006D00439140439240439180439280120C031202A81202E17582211203731203BE500804
+:20006D00439140439240439180439280120C041202A81202E17582211203731203BE500803
 :20008D0012028F1203DA40FB12020A30790BE5327007E53170031200FD307814E53BB533CA
-:2000AD000FE53CB5320A7403B53105755000D2001200D21204C680D3858247E54760051215
-:2000CD0004A280F722300027C2957582421200C5D2957582211200C5C2957582421200C559
-:2000ED00D2957582E11200C512040450D8C20022A27F9201C212120E25AF33AE3DAD3EA290
-:20010D00019212C007C006C005120E25D005D006D007C3ED9E400BEF9E4014ED9F401002BC
+:2000AD000FE53CB5320A7403B53105755000D2001200D21204C780D3858247E54760051214
+:2000CD0004A380F722300027C2957582421200C5D2957582211200C5C2957582421200C558
+:2000ED00D2957582E11200C512040450D8C20022A27F9201C212120E26AF33AE3DAD3EA28F
+:20010D00019212C007C006C005120E26D005D006D007C3ED9E400BEF9E4014ED9F401002BB
 :20012D00013DC3EF9E5005C3ED9F400302013D22C295758242120373D295758221120373BC
 :10014D00C295758242120373D2957582FA020373BA
 :20015D00AF828FF005F07401800225E0D5F0FB429D75BD0075BC8022AF8274A84FF5BC00F0
@@ -20,10 +20,10 @@
 :20023500DAF87582001201C30201B91201B97582BF1201C37A0379311201E4A78209DAF8D4
 :200255000201B91201B97582FF1201C37A0A79381201E4A78209DAF81201B9853A2F221217
 :2002750001B9852F3A7582FE1201C37A0A793887821201C309DAF80201B97A11790078319E
-:20029500900F14E993F60809DAF9120222853A2F0202741201B97A05792587821201C309D3
+:20029500900F15E993F60809DAF9120222853A2F0202741201B97A05792687821201C309D1
 :2002B500DAF81201E4AF8253077F758280C0071201C3D0078F821201C31201B9120258AF9D
 :0C02D50038E5396207BFFF012202028FEA
-:160F14005559191231011655AA00080008176301008E009000817D
+:160F15005559191231011655AA00080008176301008E009000817C
 :2002E100438E80758CFB758AAFC28DD28CD2A9D2AF22C023C0E0C0F0C082C083C007C006F2
 :20030100C005C004C003C002C001C000C0D075D00012045AAF421542EF700975423CE54739
 :2003210060021547AF431543EF702A7543C812037BE54A6002154AAF441544EF700B7544BC
@@ -34,106 +34,106 @@
 :2003C100480474018001E4FF74E0B5490474018001E45F6002D322C322C203C20474FFB579
 :2003E100480474018001E4FF74FFB5490474018001E45F6002C322D32274E0B54902D322A4
 :20040100A206221003028002D322C3221004028002D322C322AF82100301228F5022AF8295
-:20042100100301228F502008021550740CB54B0122854B82020AC4AF82100401228F5022E9
-:19044100AF82100401228F502009021550740CB54C0122854C82020AC404
+:20042100100301228F502008021550740CB54B0122854B82020AC5AF82100401228F5022E8
+:19044100AF82100401228F502009021550740CB54C0122854C82020AC503
 :20045A00E55D601B855CF005F07404800225E0D5F0FBF452B0E55C2458F987A0155D22E5F4
-:20047A005E600643B03C155E22055C74FC255C5003755C0085565D743FB55D04755E01226D
-:20049A00743FC3955DF55E22C20AA205920BA205920CA20E920D12020A853382120B1E85A9
-:2004BA00324ED211120CC0C211020D037582061201A1E5820303543FFF7E008F828E83129A
-:2004DA000D75858256A20F82055010758207120175120DA4858257C20F8005200502D20F86
-:2004FA00E55024D05003020A94E550240B83F582E550243483F583E47373A6DC0827394BE1
-:20051A00647D8FA1CBECFE2C4B5D7D9DB5DDFF112B435B6C7D95ADC5DDEEFF2F1846735F89
-:20053A0087B4A0C8DA0531516D05050506060606060606060606060707070707070707089F
-:20055A000808080808080808080808090909090909090909090A0A0A0A1204A275820512E1
-:20057A00041612040D50067546C87550017430B5310280012275461E307C03755004307B5A
-:20059A0003755003207A012275500222C20AA205920BC20CC20D12020A85324D85314E12EB
-:2005BA000CC0120D0375820012041612040D50097531001202227546C8E5466001227550C2
-:2005DA000022120B8275820512041612040DE54660012275461E307C03755004307B0375D3
-:2005FA005003307B0122307C012275500022120BB775820512041612040DE54660012275C8
-:20061A00461E307C047550042275500022120BDBE5467002F55075820512041602040D7550
-:20063A008200120A98758206120416758209020438758201120A98758207120416754C016B
-:20065A00A2789209758218020441758202120A98758208120416754C05A27A920975821C0D
-:20067A00020441758203120A9875822F120416758221020438758200120AC475820C1204D3
-:20069A001675820A020438D20BD20CA20E920D120CC6120D0375820B12041612040D400149
-:2006BA0022853382120C10AF828F33120B1ED21022120CC0120D0975820C12041612040D0C
-:2006DA00400122854E82120C3385824E854E32D21022758201120AC475820F120416758298
-:2006FA000D020438D20BD20CA20E920D853B82120B1E853C4E120CC6120D0375820E1204DE
-:20071A001612040D400122853B82120C10E582F53B22120CC0120D0975820F1204161204AC
-:20073A000D400122854E82120C3385824E854E3C22758202120AC4758212120416758210EE
-:20075A00020438120B33120CC6120D0375821112041612040D400122853D82120C10E58258
-:20077A00F53D22120B33120CC0120D0975821212041612040D400122853E82120C10E58220
-:20079A00F53E22D20BC20CC20D758203120AC4758215120416758213020438120B5D120C7E
-:2007BA00C6120D0375821412041675822F12041612040D400122755F00854D82120C42851B
-:2007DA00824D22120B5D120CC0120D0975821512041612040D400122755F02854E82120C87
-:2007FA004285824E22758204120AC475822F120416758216020438120BC675822F12041679
-:20081A0012040D400122853682120C95E582F53622120B0DC278754B02A279920875821AA8
-:20083A0012041F758218020438120AFCD278754B02A279920875821A12041F7582170204E9
-:20085A0038120B0DC27975822F12041675821A020438120AFCD27975822F1204167582197B
-:20087A00020438120B0DC27A754B03A27B920875821E12041F75821C020438120AFCD27A41
-:20089A00754B03A27B920875821E12041F75821B020438120B0DC27B754B04A27C920875D2
-:2008BA00822012041F75821E020438120AFCD27B754B04A27C920875822012041F75821DB3
-:2008DA00020438120B0DC27C75822F120416758220020438120AFCD27C75822F1204167584
-:2008FA00821F020438758204120A98758224120416754C0CA27F9209758223020441758228
-:20091A0006120AE0D212120E25758224120416758222020438758207120AE0C212120E25E1
-:20093A0075822412041675822302043875820A120A98758227120416754C0CA27D92097503
-:20095A008226020441758208120AE0D27D758227120416758225020438758209120AE0C2E2
-:20097A007D758227120416758226020438758209120A9875822A120416754C0CA27E9209B2
-:20099A00758229020441758205120A98D27E75822A120416758228020438758206120A987B
-:2009BA00C27E75822A120416758229020438758207120A9875822D12041675822B020438D0
-:2009DA00D20BC20CC20D853F4D85404E120CC6120D0375822C12041612040D400122854DB2
-:2009FA0082120CA485824F854F3F2285404E120CC0120D0975822D12041612040D4001221F
-:200A1A00854E82120CA485824FC3E53F954F5003754F01854F4022AF3FC3EF954050068FDC
-:200A3A004075502B22758208120A9875822F12041675822E020438120B8275822F120416F1
-:200A5A0012040D5038AF41BF0F047541F122EF04F54122120C032010051202408005753126
-:200A7A0000C210120222120274754606E54670FC12040412040D7550002275500022E58202
-:200A9A00258225E0FF900F4293FE8E58EF04900F4293FE8E5974022F900F4293FE8E5A747A
-:200ABA00032F900F4293FF8F5B22E5822582FF900F2A93FE8E58EF04900F2A93FF8F597573
-:200ADA005AFF755BFF22AF827558FF7559FFEF2FFF900F2A93FE8E5AEF04900F2A93FF8FAC
-:200AFA005B22900F40E493FF8F5A900F41E493FF8F5B22900F3EE493FF8F5A900F3FE4932E
-:200B1A00FF8F5B22AF82307F0B741F5FF54DEFA2E5920E228F4DC20E22307F1A741F553D9D
-:200B3A00F54DE53DA2E5920B741F553EF54EE53EA2E5920D800A853D4DC20B853E4EC20D1B
-:200B5A00C20C22307E0885354D85344E800685344D85354ED20B22307E07854D35854E3471
-:200B7A0022854D34854E3522AF57E5412FF582120DE885824D74F0554DC4540F900F8693F7
-:200B9A00FF8F58740F554D900F8693FF8F59307D05755A318003755A70755BFF22D20BC28D
-:200BBA000CC20D120B5D120CC0020D031203FA5003020BDB7558FF7559FF755AFF755BFF56
-:200BDA0022C20BC20CC20D85364D7558FF7859A94D19E92929F97A03900F6E307E03A3A306
-:200BFA00A3E993F60809DAF9227558FF7559FF755AFF755BFF22AF82307F078F82120E0B45
-:200C1A00AF82EF2401D4FFBF24027F00307F078F82120DFFAF828F8222AF82EF2401D4FFDD
-:200C3A00BF60027F008F8222AF82E55F7015307E098F82120C73AE82801C8F82120C84AE47
-:200C5A00828013307E098F82120C84AE8280078F82120C73AE828E8222AF82EF2401D4FF28
-:200C7A00BF13027F018F358F8222AF82EF2401D4FFBF32027F018F348F8222AF82EF240149
-:200C9A00D4FFBF08027F018F8222AF82EF2401D4FF8F82C007120DD4AE82D007EE24C050DF
-:200CBA00027F018F8222D38006C380031203FA74FF3400F55174FFA20AB313F55274FFA289
-:200CDA000BB313F553900F86E54DC4540F301106700474FF80059345515552F558740F55BB
-:200CFA004D9345515553F55922D38006C380031203FA74FF3400F55174FFA20CB313F55481
-:200D1A0074FFA20DB313F555E54EC4540F900F909345515554F55A740F554E900F869345BA
-:060D3A00515555F55B2246
-:200F2A00C6C788C7C689A188A191878CCFA4A499FF8EFFC69C8E9CAB9286B8FF8386B08C87
-:200F4A00A192A1FFC68E82FFF924A499F92486F9B079CFA483AFB8FFC688F8FFA188B886B8
-:200F6A008786C98C92DCABC99CAB87DC8481A0A18799E38EBDFB92848792DCABC0F9A4B027
-:100F8A00999282F88090C0CFA4868B9290C7808273
-:200D4000E560C39562F582E5619563F583E568C39566F56AE5699567F56B120E92E564C395
-:200D60009562F56AE5659563F56B120ED8AE82E5662EF5822285826085836175623F756383
-:200D800000756401756500854082120DD4AF828F66756700853F82120DD4AF828F68756924
-:200DA00000020D408582608583617562F2756302756419756501307D0E756620756700759D
-:200DC000687B756900800AE4F566F567756833F569020D40AF8274F05FC4540F75F00AA442
-:200DE000FE740F5F2EF58222AF8275F00AEF84FE75F00AEF84AFF0EEC454F04FF5822212CA
-:200E00000DD4E582900F9A93F58222AF827E00EE900F9A93FDB5070280060EEE24E850EF34
-:200E20008E82020DE8A212207F01B34064301231D210D27FD27ED27D853382120DFFE582FC
-:200E4000F533853B82120DFFE582F53B853D82120DFFE582F53D853E82120DFFE582F53E7B
-:200E600022D210C27FC27EC27D853382120E0BE582F533853B82120E0BE582F53B853D8272
-:120E8000120E0BE582F53D853E82120E0BE582F53E2270
-:180F9A00928182838485868788899091B2A1A2A3A4A5A6A7A8A9B0B1FF
+:20047A005E600643B03C155E22055C74FC255C5003755C0085565D74C1255D5004755E014D
+:20049A0022743FC3955DF55E22C20AA205920BA205920CA20E920D12020A853382120B1F0B
+:2004BA0085324ED211120CC1C211020D047582061201A1E5820303543FFF7E008F828E8325
+:2004DA00120D76858256A20F82055010758207120175120DA5858257C20F8005200502D281
+:2004FA000FE55024D05003020A95E550240B83F582E550243483F583E47374A7DD09283A16
+:20051A004C657E90A2CCEDFF2D4C5E7E9EB6DE00122C445C6D7E96AEC6DEEF00301947747D
+:20053A006088B5A1C9DB0632526E050505060606060606060606060607070707070707083D
+:20055A00080808080808080808080809090909090909090909090A0A0A0A1204A3758205E9
+:20057A0012041612040D50067546C87550017430B5310280012275461E307C0375500430C3
+:20059A007B03755003207A012275500222C20AA205920BC20CC20D12020A85324D85314E82
+:2005BA00120CC1120D0475820012041612040D50097531001202227546C8E54660012275FE
+:2005DA00500022120B8375820512041612040DE54660012275461E307C03755004307B03F7
+:2005FA00755003307B0122307C012275500022120BB875820512041612040DE546600122C7
+:20061A0075461E307C047550042275500022120BDCE5467002F55075820512041602040D4F
+:20063A00758200120A99758206120416758209020438758201120A99758207120416754CF5
+:20065A0001A2789209758218020441758202120A99758208120416754C05A27A9209758227
+:20067A001C020441758203120A9975822F120416758221020438758200120AC575820C12B9
+:20069A00041675820A020438D20BD20CA20E920D120CC7120D0475820B12041612040D4044
+:2006BA000122853382120C11AF828F33120B1FD21022120CC1120D0A75820C120416120414
+:2006DA000D400122854E82120C3485824E854E32D21022758201120AC575820F120416750B
+:2006FA00820D020438D20BD20CA20E920D853B82120B1F853C4E120CC7120D0475820E125D
+:20071A00041612040D400122853B82120C11E582F53B22120CC1120D0A75820F12041612A9
+:20073A00040D400122854E82120C3485824E854E3C22758202120AC57582121204167582F8
+:20075A0010020438120B34120CC7120D0475821112041612040D400122853D82120C11E5C6
+:20077A0082F53D22120B34120CC1120D0A75821212041612040D400122853E82120C11E51C
+:20079A0082F53E22D20BC20CC20D758203120AC5758215120416758213020438120B5E1206
+:2007BA000CC7120D0475821412041675822F12041612040D400122755F00854D82120C4391
+:2007DA0085824D22120B5E120CC1120D0A75821512041612040D400122755F02854E82120B
+:2007FA000C4385824E22758204120AC575822F120416758216020438120BC775822F120480
+:20081A001612040D400122853682120C96E582F53622120B0EC278754B02A27992087582AA
+:20083A001A12041F758218020438120AFDD278754B02A279920875821A12041F75821702D2
+:20085A000438120B0EC27975822F12041675821A020438120AFDD27975822F12041675828E
+:20087A0019020438120B0EC27A754B03A27B920875821E12041F75821C020438120AFDD2A0
+:20089A007A754B03A27B920875821E12041F75821B020438120B0EC27B754B04A27C9208CC
+:2008BA0075822012041F75821E020438120AFDD27B754B04A27C920875822012041F75825A
+:2008DA001D020438120B0EC27C75822F120416758220020438120AFDD27C75822F120416DA
+:2008FA0075821F020438758204120A99758224120416754C0CA27F92097582230204417534
+:20091A008206120AE1D212120E26758224120416758222020438758207120AE1C212120E81
+:20093A002675822412041675822302043875820A120A99758227120416754C0CA27D920951
+:20095A00758226020441758208120AE1D27D758227120416758225020438758209120AE12D
+:20097A00C27D758227120416758226020438758209120A9975822A120416754C0CA27E92F8
+:20099A0009758229020441758205120A99D27E75822A120416758228020438758206120A09
+:2009BA0099C27E75822A120416758229020438758207120A9975822D12041675822B02046E
+:2009DA0038D20BC20CC20D853F4D85404E120CC7120D0475822C12041612040D40012285C5
+:2009FA004D82120CA585824F854F3F2285404E120CC1120D0A75822D12041612040D4001F1
+:200A1A0022854E82120CA585824FC3E53F954F5003754F01854F4022AF3FC3EF9540500648
+:200A3A008F4075502B22758208120A9975822F12041675822E020438120B8375822F120476
+:200A5A001612040D5038AF41BF0F047541F122EF04F54122120C0420100512024080057540
+:200A7A003100C210120222120274754606E54670FC12040412040D7550002275500022E553
+:200A9A0082258225E0FF900F4393FE8E58EF04900F4393FE8E5974022F900F4393FE8E5A69
+:200ABA0074032F900F4393FF8F5B22E5822582FF900F2B93FE8E58EF04900F2B93FF8F5971
+:200ADA00755AFF755BFF22AF827558FF7559FFEF2FFF900F2B93FE8E5AEF04900F2B93FFC4
+:200AFA008F5B22900F41E493FF8F5A900F42E493FF8F5B22900F3FE493FF8F5A900F40E42E
+:200B1A0093FF8F5B22AF82307F0B741F5FF54DEFA2E5920E228F4DC20E22307F1A741F5547
+:200B3A003DF54DE53DA2E5920B741F553EF54EE53EA2E5920D800A853D4DC20B853E4EC2EB
+:200B5A000DC20C22307E0885354D85344E800685344D85354ED20B22307E07854D35854E98
+:200B7A003422854D34854E3522AF57E5412FF582120DE985824D74F0554DC4540F900F8754
+:200B9A0093FF8F58740F554D900F8793FF8F59307D05755A318003755A70755BFF22D20BBB
+:200BBA00C20CC20D120B5E120CC1020D041203FA5003020BDC7558FF7559FF755AFF755B8F
+:200BDA00FF22C20BC20CC20D85364D7558FF7859A94D19E92929F97A03900F6F307E03A3A9
+:200BFA00A3A3E993F60809DAF9227558FF7559FF755AFF755BFF22AF82307F078F82120EAD
+:200C1A000CAF82EF2401D4FFBF24027F00307F078F82120E00AF828F8222AF82EF2401D4CE
+:200C3A00FFBF60027F008F8222AF82E55F7015307E098F82120C74AE82801C8F82120C85F4
+:200C5A00AE828013307E098F82120C85AE8280078F82120C74AE828E8222AF82EF2401D477
+:200C7A00FFBF13027F018F358F8222AF82EF2401D4FFBF32027F018F348F8222AF82EF244B
+:200C9A0001D4FFBF08027F018F8222AF82EF2401D4FF8F82C007120DD5AE82D007EE24C02D
+:200CBA0050027F018F8222D38006C380031203FA74FF3400F55174FFA20AB313F55274FFDB
+:200CDA00A20BB313F553900F87E54DC4540F301106700474FF80059345515552F558740F6D
+:200CFA00554D9345515553F55922D38006C380031203FA74FF3400F55174FFA20CB313F580
+:200D1A005474FFA20DB313F555E54EC4540F900F919345515554F55A740F554E900F8793A9
+:070D3A0045515555F55B2200
+:200F2B00C6C788C7C689A188A191878CCFA4A499FF8EFFC69C8E9CAB9286B8FF8386B08C86
+:200F4B00A192A1FFC68E82FFF924A499F92486F9B079CFA483AFB8FFC688F8FFA188B886B7
+:200F6B008786C98C92DCABC99CAB87DC8481A0A18799E38EBDFB92848792DCABC0F9A4B026
+:100F8B00999282F88090C0CFA4868B9290C7808272
+:200D4100E560C39562F582E5619563F583E568C39566F56AE5699567F56B120E93E564C393
+:200D61009562F56AE5659563F56B120ED9AE82E5662EF5822285826085836175623F756381
+:200D810000756401756500854082120DD5AF828F66756700853F82120DD5AF828F68756921
+:200DA10000020D418582608583617562F2756302756419756501307D0E756620756700759B
+:200DC100687B756900800AE4F566F567756833F569020D41AF8274F05FC4540F75F00AA440
+:200DE100FE740F5F2EF58222AF8275F00AEF84FE75F00AEF84AFF0EEC454F04FF5822212C9
+:200E01000DD5E582900F9B93F58222AF827E00EE900F9B93FDB5070280060EEE24E850EF30
+:200E21008E82020DE9A212207F01B34064301231D210D27FD27ED27D853382120E00E582F8
+:200E4100F533853B82120E00E582F53B853D82120E00E582F53D853E82120E00E582F53E74
+:200E610022D210C27FC27EC27D853382120E0CE582F533853B82120E0CE582F53B853D826F
+:120E8100120E0CE582F53D853E82120E0CE582F53E226D
+:180F9B00928182838485868788899091B2A1A2A3A4A5A6A7A8A9B0B1FE
 :06004000E478FFF6D8FD94
-:20001E007900E94400601B7A00900FB2780175A000E493F2A308B8000205A0D9F4DAF275C7
+:20001E007900E94400601B7A00900FB3780175A000E493F2A308B8000205A0D9F4DAF275C6
 :02003E00A0FF21
-:1D0E9200E582856AF0A4C582C0F0856BF0A4D0F025F0C583856AF0A42583F58322FC
-:200EAF007A10E4FBFCE58225E0F582E58333F583EB33FBEC33FCEB956AF5F0EC956B400693
-:090ECF00FCABF0438201DADD22E4
+:1D0E9300E582856AF0A4C582C0F0856BF0A4D0F025F0C583856AF0A42583F58322FB
+:200EB0007A10E4FBFCE58225E0F582E58333F583EB33FBEC33FCEB956AF5F0EC956B400692
+:090ED000FCABF0438201DADD22E3
 :200046007800E84400600A790175A000E4F309D8FC7800E84400600C7900900001E4F0A3B8
 :04006600D8FCD9FAEF
-:0D00110075816B120F10E582600302000E76
-:200ED800C2D5E58330E70DD2D5E4C39582F582E49583F583E56B30E70DB2D5E4C3956AF5F1
-:180EF8006AE4956BF56B120EAF30D50BE4C39582F582E49583F583228A
-:040F100075820022C4
+:0D00110075816B120F11E582600302000E75
+:200ED900C2D5E58330E70DD2D5E4C39582F582E49583F583E56B30E70DB2D5E4C3956AF5F0
+:180EF9006AE4956BF56B120EB030D50BE4C39582F582E49583F5832288
+:040F110075820022C3
 :00000001FF
diff --git a/src/display.c b/src/display.c
@@ -85,7 +85,7 @@ void displayUpdateISR(void){
         if (++aPos >= 4)            // Done with this digit so move to next
             aPos = 0;               // and reset timers so next time in turn on new anode
             aOnTicks = brightLevel;
-            if (aOnTicks == MAX_BRIGHT)
+            if (aOnTicks >= MAX_BRIGHT)
                aOffTicks = 1;      // don't allow Off to goto zero!!
             else
                aOffTicks = MAX_BRIGHT - aOnTicks;