From cba53dd7ae54f6c1ee3450a15e82f1c859fb4916 Mon Sep 17 00:00:00 2001
From: lili-ffxi <40600148+lili-ffxi@users.noreply.github.com>
Date: Sat, 13 Feb 2021 03:31:25 +0000
Subject: [PATCH 1/3] Fixing errors on Linkshell/Linkpearls/Pearlsacks

This change fixes two errors that happen when Linkshells with certain combinations of characters result in a bitpacked LS name that contains zeroed bytes in the middle.
First change detects the length of the name properly, second change fixes the `nil` error.
---
 addons/libs/extdata.lua | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/libs/extdata.lua b/addons/libs/extdata.lua
index c92e7bdcf..456c0a5e8 100644
--- a/addons/libs/extdata.lua
+++ b/addons/libs/extdata.lua
@@ -1481,7 +1481,7 @@ function tools.bit.l_to_r_bit_packed(dat_string,start,stop)
     local c_count = math.ceil(stop/8)
     while c_count >= math.ceil((start+1)/8) do
         -- Grabs the most significant byte first and works down towards the least significant.
-        local cur_val = dat_string:byte(c_count)
+        local cur_val = dat_string:byte(c_count) or 0
         local scal = 1
         
         if c_count == math.ceil(stop/8) then -- Take the least significant bits of the most significant byte
@@ -1683,7 +1683,17 @@ end
 
 function decode.Linkshell(str)
     local status_map = {[0]='Unopened',[1]='Linkshell',[2]='Pearlsack',[3]='Linkpearl',[4]='Broken'}
-    local name_end = string.find(str,string.char(0),10)
+    local name_end = function()
+        if str:sub(#str,#str) ~= string.char(0) then
+          return #str
+        end
+        for i=#str-1,10,-1 do
+            if str:sub(i,i) ~= string.char(0) then
+                return i
+            end
+        end
+    end()
+
     local name_map = {[0]="'",[1]="a",[2]='b',[3]='c',[4]='d',[5]='e',[6]='f',[7]='g',[8]='h',[9]='i',[10]='j',
         [11]='k',[12]='l',[13]='m',[14]='n',[15]='o',[16]='p',[17]='q',[18]='r',[19]='s',[20]='t',[21]='u',[22]='v',[23]='w',
         [24]='x',[25]='yx',[26]='z',[27]='A',[28]='B',[29]='C',[30]='D',[31]='E',[32]='F',[33]='G',[34]='H',[35]='I',[36]='J',

From 290f004b65fb01bb323e05400d590ad77a4db255 Mon Sep 17 00:00:00 2001
From: lili-ffxi <40600148+lili-ffxi@users.noreply.github.com>
Date: Sat, 13 Feb 2021 11:57:52 +0000
Subject: [PATCH 2/3] Update extdata.lua

---
 addons/libs/extdata.lua | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/addons/libs/extdata.lua b/addons/libs/extdata.lua
index 456c0a5e8..5bec6cc42 100644
--- a/addons/libs/extdata.lua
+++ b/addons/libs/extdata.lua
@@ -1683,17 +1683,10 @@ end
 
 function decode.Linkshell(str)
     local status_map = {[0]='Unopened',[1]='Linkshell',[2]='Pearlsack',[3]='Linkpearl',[4]='Broken'}
-    local name_end = function()
-        if str:sub(#str,#str) ~= string.char(0) then
-          return #str
-        end
-        for i=#str-1,10,-1 do
-            if str:sub(i,i) ~= string.char(0) then
-                return i
-            end
-        end
-    end()
-
+    local name_end = #str
+    while str:byte(name_end) == 0 do
+        name_end = name_end - 1
+    end
     local name_map = {[0]="'",[1]="a",[2]='b',[3]='c',[4]='d',[5]='e',[6]='f',[7]='g',[8]='h',[9]='i',[10]='j',
         [11]='k',[12]='l',[13]='m',[14]='n',[15]='o',[16]='p',[17]='q',[18]='r',[19]='s',[20]='t',[21]='u',[22]='v',[23]='w',
         [24]='x',[25]='yx',[26]='z',[27]='A',[28]='B',[29]='C',[30]='D',[31]='E',[32]='F',[33]='G',[34]='H',[35]='I',[36]='J',

From 9cfde8c039c47ea5ecef204772e82153eb9e8ed6 Mon Sep 17 00:00:00 2001
From: lili-ffxi <40600148+lili-ffxi@users.noreply.github.com>
Date: Sat, 13 Feb 2021 12:01:15 +0000
Subject: [PATCH 3/3] Update extdata.lua

---
 addons/libs/extdata.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/libs/extdata.lua b/addons/libs/extdata.lua
index 5bec6cc42..61f73a2d9 100644
--- a/addons/libs/extdata.lua
+++ b/addons/libs/extdata.lua
@@ -1684,7 +1684,7 @@ end
 function decode.Linkshell(str)
     local status_map = {[0]='Unopened',[1]='Linkshell',[2]='Pearlsack',[3]='Linkpearl',[4]='Broken'}
     local name_end = #str
-    while str:byte(name_end) == 0 do
+    while str:byte(name_end) == 0 and name_end > 10 do
         name_end = name_end - 1
     end
     local name_map = {[0]="'",[1]="a",[2]='b',[3]='c',[4]='d',[5]='e',[6]='f',[7]='g',[8]='h',[9]='i',[10]='j',