From e029ce1e44af298712d8a942dd4f343006c20572 Mon Sep 17 00:00:00 2001
From: Fang <git@fang.io>
Date: Fri, 8 Mar 2019 12:44:10 +0100
Subject: [PATCH] Fix off-by-ones in Ethereum ABI en/decoding logic

---
 sys/zuse.hoon | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sys/zuse.hoon b/sys/zuse.hoon
index af14f9f3dd..caf849407a 100644
--- a/sys/zuse.hoon
+++ b/sys/zuse.hoon
@@ -7831,9 +7831,13 @@
         ^-  octs
         ::  parse {bys} bytes from {fro}.
         :-  bys
-        %^  rsh  3  (sub 32 (mod bys 33))
+        %^  rsh  3
+          =+  (mod bys 32)
+          ?:(=(0 -) - (sub 32 -))
         %+  rep  8
-        (flop (swag [fro +((div (dec bys) 32))] wos))
+        %-  flop
+        =-  (swag [fro -] wos)
+        +((div (dec bys) 32))
       ::
       ++  decode-array-n
         ::NOTE  we take (list etyp) even though we only operate on
@@ -8214,8 +8218,10 @@
     |=  [wat=tape mof=@ud wer=?(%left %right)]
     ^-  tape
     =+  len=(lent wat)
-    ?:  =(len mof)  wat
-    =+  tad=(reap (sub mof (mod len mof)) '0')
+    ?:  =(0 len)  (reap mof '0')
+    =+  mad=(mod len mof)
+    ?:  =(0 mad)  wat
+    =+  tad=(reap (sub mof mad) '0')
     %-  weld
     ?:(?=(%left wer) [tad wat] [wat tad])
   ::