fix crash when a hash's LSbyte is 0

smoldd.py

@@ -121,11 +121,12 @@ def main():
         # if the next libname/first byte of the hash is null, the table has
         # come to an end.
 
+        if is32bit:
             j = poff
             strtaboff = 0
             while j < poff + pfsz:
-            tag, j = (readint(blob, j) if is32bit else readlong(blob, j))
-            ptr, j = (readint(blob, j) if is32bit else readlong(blob, j))
+                tag, j = readint(blob, j)
+                ptr, j = readint(blob, j)
 
                 if tag == 5: # DT_STRTAB
                     strtaboff = ptr
@@ -141,12 +142,12 @@ def main():
 
                     sys.stdout.write("* " + libname)
 
-                libs = list(find_libs((32 if is32bit else 64), deflibs, libname))
+                    libs = list(find_libs(32, deflibs, libname))
                     print(" -> NOT FOUND" if len(libs) == 0 else (" -> " + libs[0]))
                     ht = dict({}) if len(libs) == 0 else build_hashtab(args.scanelf, libs[0])
 
                     while True:
-                    hashv, j = (readint(blob, j) if is32bit else readlong(blob, j))
+                        hashv, j = readint(blob, j)
 
                         if (hashv & 0xFF) == 0:
                             break
@@ -157,6 +158,9 @@ def main():
                     j = bakoff
 
             break
+        else: # 64-bit
+            eprintf("Currently unsuppored, sorry.")
+            sys.exit(1)
 
 if __name__ == '__main__':
     main()

src/loader64.asm

@@ -129,7 +129,7 @@ repne scasd ; technically, scasq should be used, but ehhhh
 
                 ; *phash = finaladdr
           stosq
-            cmp byte [rdi], 0
+            cmp word [rdi], 0
             jne short .next_hash
             ; } while (1)
 ;       jmp short .next_hash