From: senhuang42 <senhuang96@fb.com>
Date: Thu, 12 Nov 2020 16:57:01 +0000 (-0500)
Subject: Fix incorrect repcode setting
X-Git-Tag: v1.4.7~32^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=396275068cc64f1afda598723743963cdd380a2e;p=thirdparty%2Fzstd.git

Fix incorrect repcode setting
---

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 5719c8cbb..55ef0fe91 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -2522,6 +2522,7 @@ static void ZSTD_copyBlockSequences(ZSTD_CCtx* zc)
 
         /* Derive the correct offset from the repcode in seqStore_t */
         if (seqStoreSeqs[i].offset <= ZSTD_REP_NUM) {
+            outSeqs[i].rep = seqStoreSeqs[i].offset;
             if (seqStoreSeqs[i].litLength != 0) {
                 if (seqStoreSeqs[i].offset == 1) {
                     shouldUpdateRep = 0;
@@ -2537,12 +2538,10 @@ static void ZSTD_copyBlockSequences(ZSTD_CCtx* zc)
                 } else if (seqStoreSeqs[i].offset == 3) {
                     rawOffset = rep[2];
                 }
-                outSeqs[i].rep = seqStoreSeqs[i].offset;
             } else {
                 /* Litlength == 0 is a special case for repcode handling */
                 if (seqStoreSeqs[i].offset == 1) {
                     U32 tmp;
-                    outSeqs[i].rep = 1;
                     rawOffset = rep[1];
                     /* Swap ranks of rep[0] and rep[1] */
                     tmp = rep[0];
@@ -2550,10 +2549,8 @@ static void ZSTD_copyBlockSequences(ZSTD_CCtx* zc)
                     rep[1] = tmp;
                     shouldUpdateRep = 0;
                 } else if (seqStoreSeqs[i].offset == 2) {
-                    outSeqs[i].rep = 2;
                     rawOffset = rep[2];
                 } else if (seqStoreSeqs[i].offset == 3) {
-                    outSeqs[i].rep = 1;
                     rawOffset = rep[0] - 1;
                 }
             }