From ce859c36d3935e270df822e5765ad40d76178220 Mon Sep 17 00:00:00 2001
From: Adrian Wielgosik <adrian.wielgosik@gmail.com>
Date: Wed, 23 Oct 2024 19:04:46 +0200
Subject: [PATCH] avm2: Use FP-compatible settings in ByteArray.compress

---
 core/src/avm2/bytearray.rs                    |   6 ++++--
 .../swfs/avm2/bytearray_compress/Test.as      |  18 +++++++++++++++++-
 .../swfs/avm2/bytearray_compress/output.txt   |   3 +++
 .../swfs/avm2/bytearray_compress/test.fla     | Bin 4466 -> 0 bytes
 .../swfs/avm2/bytearray_compress/test.swf     | Bin 1363 -> 969 bytes
 5 files changed, 24 insertions(+), 3 deletions(-)
 delete mode 100644 tests/tests/swfs/avm2/bytearray_compress/test.fla

diff --git a/core/src/avm2/bytearray.rs b/core/src/avm2/bytearray.rs
index 79045ab407eb..65cffc15e508 100644
--- a/core/src/avm2/bytearray.rs
+++ b/core/src/avm2/bytearray.rs
@@ -229,11 +229,13 @@ impl ByteArrayStorage {
         let mut buffer = Vec::new();
         let error: Option<Box<dyn std::error::Error>> = match algorithm {
             CompressionAlgorithm::Zlib => {
-                let mut encoder = ZlibEncoder::new(&*self.bytes, Compression::fast());
+                // Note: some content is sensitive to compression type
+                // (as it's visible in the header)
+                let mut encoder = ZlibEncoder::new(&*self.bytes, Compression::best());
                 encoder.read_to_end(&mut buffer).err().map(|e| e.into())
             }
             CompressionAlgorithm::Deflate => {
-                let mut encoder = DeflateEncoder::new(&*self.bytes, Compression::fast());
+                let mut encoder = DeflateEncoder::new(&*self.bytes, Compression::best());
                 encoder.read_to_end(&mut buffer).err().map(|e| e.into())
             }
             #[cfg(feature = "lzma")]
diff --git a/tests/tests/swfs/avm2/bytearray_compress/Test.as b/tests/tests/swfs/avm2/bytearray_compress/Test.as
index cb205e901097..066f9c47192d 100644
--- a/tests/tests/swfs/avm2/bytearray_compress/Test.as
+++ b/tests/tests/swfs/avm2/bytearray_compress/Test.as
@@ -1,3 +1,5 @@
+// compiled with mxmlc
+
 package {
     import flash.utils.ByteArray;
     import flash.utils.Endian;
@@ -36,6 +38,8 @@ package {
 
             ba.uncompress("zlib");
             print("uncompressed (zlib)", ba, true);
+
+            checkZlibPrefix();
         }
 
         function createByteArray(): ByteArray {
@@ -68,5 +72,17 @@ package {
 
             trace("");
         }
+
+        // Issue 13773: gemcraft labirynth
+        // Requires zlib->base64 values to start with "eN".
+        // (which means binary header [120, 218])
+        function checkZlibPrefix() {
+            trace("Checking zlib header:")
+            var ba = createByteArray();
+            ba.compress("zlib");
+            ba.position = 0;
+            trace(ba.readUnsignedByte());
+            trace(ba.readUnsignedByte());
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/tests/swfs/avm2/bytearray_compress/output.txt b/tests/tests/swfs/avm2/bytearray_compress/output.txt
index 54bccdb4e601..d70b0d854347 100644
--- a/tests/tests/swfs/avm2/bytearray_compress/output.txt
+++ b/tests/tests/swfs/avm2/bytearray_compress/output.txt
@@ -26,3 +26,6 @@ uncompressed (zlib) position is at 0
 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99
 
 
+Checking zlib header:
+120
+218
diff --git a/tests/tests/swfs/avm2/bytearray_compress/test.fla b/tests/tests/swfs/avm2/bytearray_compress/test.fla
deleted file mode 100644
index f4c23c5d47e41bc74546e7a6fd51285c05dce72a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4466
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

diff --git a/tests/tests/swfs/avm2/bytearray_compress/test.swf b/tests/tests/swfs/avm2/bytearray_compress/test.swf
index 47c62d4649ce94349f22be020e452374a5e06c77..2cb295c70a3fbf800983c608bdaa6cd0d791954f 100644
GIT binary patch
literal 969
zcmV;)12+6xS5q?J1polJ0{{SB001BW06YKujv4yj=Vl0?JwAo?b#KsqVJOXhixy4a
z1v37mOh!q!duw(1D_l1z3z0VgHxB9Y;ryOt+H4UaGwq-bc5tB0m@amJ@Zeci1_<fO
z>!QZnT84W^-kDu!b~qNjlRVSVp3_xhTH3JNC+2)1J*>=-p>|kv2*_BK)@TdzxW~s5
zRX~U5S-?);A+G44YL3M0*f=<)^i{biPBGOIR$l<Z>YO&{zPAusrYQ+MNi=aD#T4!$
zPkS*y<NE;B@xS6PzC>6Mr~&jb2>K)qny&rD&(ESY3$E?lK{?1zUms&{I3Vb0<VS_*
zF1j}Q^8?U=I*}R<9W>+e_VuJ%g*!>e*m8J?242(Fwy)sIf>4Gx4!fXex2K-_C7YHL
zq&0(nMSic+4w|T_j0`3+LiHl*2)R@|%lI+-mAWv9&z^FRB_KhH$-U(3=4#W>rH}|5
z=M<8Y^CpY2DttzYuI3nDQ-E+2u)qb*{BO=bOu1;9b3lw%h`5d2j%d-)Z#%$QH1WQr
z0lLv}uys_J8XcR=WlFq3qJ@FIJcS=JRGQ4ETe{Y6j&FlLrw5SHc`8NLEk`;#?xAI#
z-+UqO1>oD2bcF`f9*6o2m%a}3%}m;u9b4}Dej$dqEZn8%)WODCwojxw3C5;?HIW=o
zAiKC$cLiA)-Nun^D8c0sn_Wy}JMIz|4jb9{T_KC@?@ySgj+~@^mI*V<o??!HJlJlz
zTT>-lL8DuYEwE{+<u39tEc6wNeB+CJwyjeZ2z^(D{o;SLP{`~<OHd5TdU^&WYu1Qb
zS;}V?^#B<AE;C`zBu9&*+HL`%D4kt~R80hV{icNve+5{Y&D?BjN-;910^CaVUt7Y6
zTb&^JI`)kMa<rCYNxMiRt&bI!1+V-I^p<RzokUx^z>@g+xKDiUBb@K3yX;Ogq*A>|
zpmon^6=*GoXO>M+nqpWSLjW`PIY9SP<l&T4cD#0&zZRY}1&ZE$TgeZ7=%Sz{LG#}@
zRj@-q_m(aC1YnmK1-jkPC2TmEIujk5Tjca2wKtycN0sa)>{iR|Q9*Jo$0|E1mIOa)
zUTT~t&f`Tn=<i;yue>zXu@DFRQP|ST$M;M@wp6XPbNW<mF7*|@xkZbb1C!k}TgdFq
zmn8CZ7Bfv23}Zm#c(nO5h28YKh^6y&6Ux&Ip$DX;k-wXhUIf*YIT-A90C$Y|04x*b
rXtytYwroP%=?*kK3Y>-YQ63CNi~8k<p!7x2;3zSs6E<@H`|!$IS*P8Z

literal 1363
zcmV-Z1+4l*S5psH3IG6joTXLmQrkup-PPAx#()jj5R$YCag)&4mi!SKJcJhPxFs`;
zJArochY7N@#%g6rBguU9PiJ_8OkW^xl2@?lG>_2!>?4pX*~TW&G)*;lcK7Z%XLrxt
zy&NO{B|_7$5n8~gnpi*x{W=@x5n6NgX8C!wCLOm;%PYg^$x_Srow6(+9UbM4iaFao
zkn^jntFls%3xzBovfhd1tH)W(ySub5g$h;bX|Cb;hHXi~SZ&xH|H;zQK=!!pT*z8p
zPSx!O&1rU9K2{w$pHt*O2SDYDOI6=?cWv8T-w04r%~ZXX^u230spo;bYD$%z6)7t<
zI)<rBrN{X-`F-Y?7Olc>y`U6|S*4IwO1nzFT>7f~sQ3^%iZaISBm2~C>Z`iyt5?W{
zavsPl<K#=&0o~S(=E+BqM@VT+e$UB|^H$d`taUoB8RkpZWNOkjwR{ik&4>2tTDfVv
zZPi~_9mg~@H4v1KvtG;Aem+tUX|@?yy(W)<pSmSD+4lB_6W(siL$v2Vr_B$ez1<Us
z%Fn51cU+AE{O;hwY;TvhEYDXhjc!%fA&@f+z5HmSq!f#lV&U;d>1j2eU#-@PtA$db
zSgMsOPnBZm{blM<t!itXz_)>#{vXuFs6(~7YaAGGWv@}KJl?ErmR6L)qYtZIBXO};
z>Kcbsueo+R%z~r39u1s&vNW_RuqpJnY+SYJ-?wmuI#km?<v>@cLpA&V*z}JQ(nVrM
zK3#vM<v|f#mr#W{KR<tyoPYv}(T+wfD&-M+GxsMK1mKIKT+k>J;cLlte8cp_%@dz)
zxUPDFgdN{CtOK$Mb%?4Kw@W==s5gG1nm?_DW#$6QJAm{fJ|JF#SZrH0tX-o`O~ay-
zeRbXN98*0Jx9vlNR!qZ54$<Xtw9s_bHqA%i$v7^Q$vcC$G<rxIJ4LymC@XSMHGRX1
z4xv<!cC6tbHtJHH=oHrR>D(wJJs8B6Q{%`{I5Ozy#IV9nWYFr|FQ(B*jB|p(^6X`u
zFeV<kM&G80V|zxBBi?sajV7ewSTa0G^(93xsdeDDX5XKnmY%v4Gc2iX=(<VckOTb(
z%QFrvst0RuPRDDpvMdQw1BTv|s>4kIJ9okh66+^|9tO2^`f1QqAt|b_wWvE;?dPYT
z-^7;XQ`n~um#rU3U7D}h@Lv<M<qA7aaKfn+PO%HZJe!K9VhdCAQ6BLql2{Z{U$R8x
zqRa#v!^|y$8NzUc;Rz!Uh7c}7IFaxZM3^LzX)%t)Su7^8cms={VZwY)7>O`Tg!w|e
zheZLn%VhE)5i&%`5+O$fSwzDRE;Nf6%%bZ*hT}yRVMf4+AsDd{F+vc*QH%rxTV*)R
z!K;Yi2#2wVFlITnt9%Qx95DT^(%nMcnt)FK=+!4sH#5__Ungv@9)tc|?_SW)B<mBn
zn@RO&U=)MVe1EP!3Alv;XA1g@1J2Emb8Eo48FFribFenUupFQ6Dtq`DhLzLk^ldzf
zkk~t`Pvf&!r*F^Fdh+k{^WJxGc2?l{-*8vCbE<Lh<IkG$G@6@4XfM&r+<9G3;JAd)
zS#t&^hT*$mSnLnd!Ql6q8bUuJ&^SvY6%;@z9)~p>+*xfF)#q@7e+97y=+7koIzQh_
zWbXG~XC4IPy+nfxn+!W@;2azSeon(VlKZ@}&%Z#oTO5RWa5~y|S-?0tAp(MX#-U{h
z5EcUQ(DuDl8g-k|dWwN~1f<0KU4^1RYF^o2Q1)*q`-{r{O=Vw%zZdv+|7%46{`Kr)
V|7xINt;vno8uSg!yaTAc`B!TVs}BGG