cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-12 02:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5706 from Citadel-Station-13/upstream-merge-35754

Browse Source 
[MIRROR] Fixes a runtime in "reference decoder" circuit
This commit is contained in:
deathride58
2018-02-25 21:41:54 +00:00
committed by GitHub
parent 8c0d4177be 00aafb33e6
commit e721dfdc7c
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/__HELPERS/type2type.dm
View File

@@ -12,7 +12,8 @@
//Returns an integer given a hex input, supports negative values "-ff" //Returns an integer given a hex input, supports negative values "-ff"
//skips preceding invalid characters //skips preceding invalid characters
//breaks when hittin invalid characters thereafter //breaks when hittin invalid characters thereafter
/proc/hex2num(hex) // If safe=TRUE, returns null on incorrect input strings instead of CRASHing
/proc/hex2num(hex, safe=FALSE)
. = 0 . = 0
var/place = 1 var/place = 1
for(var/i in length(hex) to 1 step -1) for(var/i in length(hex) to 1 step -1)
@@ -26,6 +27,9 @@
num -= 55 //A-F num -= 55 //A-F
if(45) if(45)
return . * -1 // - return . * -1 // -
else
if(safe)
return null
else else
CRASH("Malformed hex number") CRASH("Malformed hex number")
@@ -582,12 +586,16 @@
r+= num2hex(c) r+= num2hex(c)
return r return r
/proc/hextostr(str) // Decodes hex to raw byte string.
// If safe=TRUE, returns null on incorrect input strings instead of CRASHing
/proc/hextostr(str, safe=FALSE)
if(!istext(str)||!str) if(!istext(str)||!str)
return return
var/r var/r
var/c var/c
for(var/i = 1 to length(str)/2) for(var/i = 1 to length(str)/2)
c= hex2num(copytext(str,i*2-1,i*2+1)) c = hex2num(copytext(str,i*2-1,i*2+1), safe)
if(isnull(c))
return null
r += ascii2text(c) r += ascii2text(c)
return r return r

2
code/modules/integrated_electronics/subtypes/converters.dm
View File

@@ -97,7 +97,7 @@
/obj/item/integrated_circuit/converter/refdecode/do_work() /obj/item/integrated_circuit/converter/refdecode/do_work()
pull_data() pull_data()
dec=XorEncrypt(hextostr(get_pin_data(IC_INPUT, 1)),SScircuit.cipherkey) dec = XorEncrypt(hextostr(get_pin_data(IC_INPUT, 1), TRUE), SScircuit.cipherkey)
set_pin_data(IC_OUTPUT, 1, WEAKREF(locate(dec))) set_pin_data(IC_OUTPUT, 1, WEAKREF(locate(dec)))
push_data() push_data()
activate_pin(2) activate_pin(2)