fixed important decoder error regarding 'invalid list size', misc fixes

README.md

@@ -255,7 +255,7 @@ Unfortunately, these binary ones cannot be looked at using the Chrome developer
 
 ### General development
 
-- [ ] Allow usage on Windows, i.e. entirely fix [#10](https://github.com/sigalor/whatsapp-web-reveng/issues/16).
+- [ ] Allow usage on Windows, i.e. entirely fix [#16](https://github.com/sigalor/whatsapp-web-reveng/issues/16).
 
 ### Documentation
 - [ ] The _Node Handling_ section. Could become very long.

backend/decoder.py

@@ -100,7 +100,7 @@ def readPacked8(self, tag):
 		ret = "";
 		for i in range(startByte & 127):
 			currByte = self.readByte();
-			ret += self.unpackByte(tag, (currByte & 240) >> 4) + self.unpackByte(tag, currByte & 15);
+			ret += self.unpackByte(tag, (currByte & 0xF0) >> 4) + self.unpackByte(tag, currByte & 0x0F);
 		if (startByte >> 7) == 0:
 			ret = ret[:len(ret)-1];
 		#print "read packed8: " + str(ret);
@@ -207,11 +207,11 @@ def readString(self, tag):
 		elif tag == Tags.LIST_EMPTY:
 			return;
 		elif tag == Tags.BINARY_8:
-			return self.readString(self.readByte());			# is this really "readStringFromChars"? At least seems like that...
+			return self.readStringFromChars(self.readByte());			# is this really "readStringFromChars"? At least seems like that...
 		elif tag == Tags.BINARY_20:
-			return self.readString(self.readInt20());
+			return self.readStringFromChars(self.readInt20());
 		elif tag == Tags.BINARY_32:
-			return self.readString(self.readInt32());
+			return self.readStringFromChars(self.readInt32());
 		elif tag == Tags.JID_PAIR:
 			i = self.readString(self.readByte());
 			j = self.readString(self.readByte());
@@ -280,13 +280,13 @@ def readBytes(self, n):
 
 	def getToken(self, index):
 		if index < 0 or index >= len(Tokens):
-			raise ValueError("invalid index: " + str(index));
+			raise ValueError("invalid token index: " + str(index));
 		return Tokens[index];
 
 	def getTokenDouble(self, index1, index2):
 		n = 256 * index1 + index2;
 		if n < 0 or n >= len(Tokens):
-			raise ValueError("invalid index: " + str(n));
+			raise ValueError("invalid token index: " + str(n));
 		return Tokens[n];
 
 

backend/node_decoder_frombase64.py

@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import sys;
+sys.dont_write_bytecode = True;
+
+import os;
+import signal;
+import base64;
+
+from utilities import *;
+import decoder;
+
+reload(sys);
+sys.setdefaultencoding("utf-8");
+
+
+
+if len(sys.argv) < 2:
+	eprint("usage: " + sys.argv[0] + " [base64 string]");
+	exit();
+
+processedData = decoder.processData("missing_tag", base64.b64decode(sys.argv[1]), doFilterNone=False, me="[email protected]", debug=True);
+print json.dumps(processedData, indent=4, ensure_ascii=False, sort_keys=True);