From a18f9f79d4926746c8a646c8ef380d7eb52d140e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=BCsers?= <aur@huesers.de>
Date: Sun, 14 Jul 2024 23:57:30 +0200
Subject: [PATCH] upgpkg: discord-electron-openasar 0.0.59+828-2: update krisp
 patcher

* Fix segfault after patching Krisp binary
---
 discord-electron-openasar/.SRCINFO         | 4 ++--
 discord-electron-openasar/PKGBUILD         | 4 ++--
 discord-electron-openasar/krisp-patcher.py | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/discord-electron-openasar/.SRCINFO b/discord-electron-openasar/.SRCINFO
index d6fe1e3..7515cd7 100644
--- a/discord-electron-openasar/.SRCINFO
+++ b/discord-electron-openasar/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = discord-electron-openasar
 	pkgdesc = Discord packaged with OpenAsar using system provided electron (v31) for increased security and performance
 	pkgver = 0.0.59+828
-	pkgrel = 1
+	pkgrel = 2
 	url = https://discord.com
 	install = discord-electron-openasar.install
 	arch = x86_64
@@ -27,7 +27,7 @@ pkgbase = discord-electron-openasar
 	source = git+https://github.com/goosemod/openasar.git#commit=5c875eb048e96543f1ec711fae522ace5e4a836c
 	sha512sums = 43a911d03d62f9d73e8058771b59d148500fc48a0cf51be90899f4927979034d73326086084d342b4885ebe74560b4b99598d8514be9a51f00a9dd2010c74132
 	sha512sums = 4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666
-	sha512sums = 3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f
+	sha512sums = ac1212b09c3c1e7af3f93294d799765a0547f20a8373bea0ecb1a3e2bcb165488eb1412141c4e577d53ae87122646b12b9339b0a3f8e6817c3865fbb3f642938
 	sha512sums = 36b7747ec2dad8ddcc84533dbe2013eae7166affd9fdaa3b5c8571faf4e1361fda2aadde719df4d4d18a7da513be51fe8e0726dbf589ebe545a0abc12960bb22
 
 pkgname = discord-electron-openasar
diff --git a/discord-electron-openasar/PKGBUILD b/discord-electron-openasar/PKGBUILD
index 4f33c4c..4f33676 100644
--- a/discord-electron-openasar/PKGBUILD
+++ b/discord-electron-openasar/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=discord-electron-openasar
 _pkgname=discord
 pkgver=0.0.59+828
 _pkgver=${pkgver%%+*}
-pkgrel=1
+pkgrel=2
 _electronver=31
 _electronname="electron${_electronver}"
 pkgdesc="Discord packaged with OpenAsar using system provided electron (v${_electronver}) for increased security and performance"
@@ -30,7 +30,7 @@ source=("https://dl.discordapp.net/apps/linux/${_pkgver}/${_pkgname}-${_pkgver}.
 	"git+https://github.com/goosemod/openasar.git#commit=5c875eb048e96543f1ec711fae522ace5e4a836c")
 sha512sums=('43a911d03d62f9d73e8058771b59d148500fc48a0cf51be90899f4927979034d73326086084d342b4885ebe74560b4b99598d8514be9a51f00a9dd2010c74132'
             '4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666'
-            '3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f'
+            'ac1212b09c3c1e7af3f93294d799765a0547f20a8373bea0ecb1a3e2bcb165488eb1412141c4e577d53ae87122646b12b9339b0a3f8e6817c3865fbb3f642938'
             '36b7747ec2dad8ddcc84533dbe2013eae7166affd9fdaa3b5c8571faf4e1361fda2aadde719df4d4d18a7da513be51fe8e0726dbf589ebe545a0abc12960bb22')
 
 # just in case I get the version wrong
diff --git a/discord-electron-openasar/krisp-patcher.py b/discord-electron-openasar/krisp-patcher.py
index 5597290..6bd44f4 100644
--- a/discord-electron-openasar/krisp-patcher.py
+++ b/discord-electron-openasar/krisp-patcher.py
@@ -41,9 +41,10 @@ found_issigned_by_discord_test = False
 found_issigned_by_discord_je = False
 found_already_patched = False
 je_location = None
+je_size = 0
 
 # We are looking for a call to IsSignedByDiscord, followed by a test, followed by a je.
-# Then we patch the je into a two byte nop.
+# Then we replace the je with nops.
 
 md = Cs(CS_ARCH_X86, CS_MODE_64)
 md.detail = True
@@ -61,6 +62,7 @@ for i in md.disasm(krisp_initialize, krisp_initialize_address):
         if found_issigned_by_discord_test:
             found_issigned_by_discord_je = True
             je_location = i.address
+            je_size = len(i.bytes)
             break
 
     if i.id == X86_INS_NOP:
@@ -74,7 +76,7 @@ if je_location:
     shutil.copyfile(executable, executable + ".orig")
     f = open(executable, 'rb+')
     f.seek(je_location - address_to_file)
-    f.write(b'\x66\x90')  # Two byte NOP
+    f.write(b'\x90' * je_size)   # je can be larger than 2 bytes given a large enough displacement :(
     f.close()
 else:
     if found_already_patched: