Merging upstream version 1.5~rc1.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 7 insertions, 7 deletions

diff --git a/decoder.c b/decoder.c
index d1df32f..9c31677 100644
--- a/decoder.c
+++ b/decoder.c
@@ -225,13 +225,7 @@ int LZd_decode_member( struct LZ_decoder * const decoder,
       int len;
       if( Rd_decode_bit( rdec, &decoder->bm_rep[state] ) == 1 )	/* 2nd bit */
         {
-        if( Rd_decode_bit( rdec, &decoder->bm_rep0[state] ) == 0 )	/* 3rd bit */
-          {
-          if( Rd_decode_bit( rdec, &decoder->bm_len[state][pos_state] ) == 0 )	/* 4th bit */
-            { state = St_set_short_rep( state );
-              LZd_put_byte( decoder, LZd_get_byte( decoder, rep0 ) ); continue; }
-          }
-        else
+        if( Rd_decode_bit( rdec, &decoder->bm_rep0[state] ) == 1 )	/* 3rd bit */
           {
           unsigned distance;
           if( Rd_decode_bit( rdec, &decoder->bm_rep1[state] ) == 0 )	/* 4th bit */
@@ -247,6 +241,12 @@ int LZd_decode_member( struct LZ_decoder * const decoder,
           rep1 = rep0;
           rep0 = distance;
           }
+        else
+          {
+          if( Rd_decode_bit( rdec, &decoder->bm_len[state][pos_state] ) == 0 )	/* 4th bit */
+            { state = St_set_short_rep( state );
+              LZd_put_byte( decoder, LZd_get_byte( decoder, rep0 ) ); continue; }
+          }
         state = St_set_rep( state );
         len = min_match_len + Rd_decode_len( rdec, &decoder->rep_len_model, pos_state );
         }