From 9beca1a307d2225a6833f5b152c0257bd2a68d36 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Wed, 17 Jul 2019 15:01:29 +0200
Subject: [PATCH] DATV demod: MSVC build: fixed some initializations and
 destructions

---
 plugins/channelrx/demoddatv/leansdr/bch.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/plugins/channelrx/demoddatv/leansdr/bch.h b/plugins/channelrx/demoddatv/leansdr/bch.h
index 6315e47e5..8fb4c11db 100644
--- a/plugins/channelrx/demoddatv/leansdr/bch.h
+++ b/plugins/channelrx/demoddatv/leansdr/bch.h
@@ -105,9 +105,12 @@ struct bch_engine : bch_interface
             if (S[i])
                 corrupted = true;
         }
-        delete[] rem;
         if (!corrupted)
+        {
+            delete[] S;
+            delete[] rem;
             return 0;
+        }
 #if 0
       fprintf(stderr, "synd:");
       for ( int i=0; i<2*npolys; ++i ) fprintf(stderr, " %04x", S[i]);
@@ -124,9 +127,9 @@ struct bch_engine : bch_interface
 
         int NN = 2 * npolys;
         TGF *C = new TGF[NN];
-        std::fill(C, C+NN, 1);
+        C[0] = 1;
         TGF *B = new TGF[NN];
-        std::fill(C, C+NN, 1);
+        B[0] = 1;
         // TGF C[NN] = { crap code
         //     1,
         // },
@@ -165,7 +168,6 @@ struct bch_engine : bch_interface
                 }
             }
         }
-        delete[] S;
         // L is the number of errors.
         // C of degree L is the error locator polynomial (Lambda).
         // C(X) = sum(l=1..L)(1-X_l*X).
@@ -197,6 +199,8 @@ struct bch_engine : bch_interface
                     // This may happen if the code is used truncated.
                     delete[] C;
                     delete[] B;
+                    delete[] S;
+                    delete[] rem;
                     return -1;
                 }
                 cw[rloc / 8] ^= 128 >> (rloc & 7);
@@ -208,6 +212,8 @@ struct bch_engine : bch_interface
 
         delete[] C;
         delete[] B;
+        delete[] S;
+        delete[] rem;
 
         if (roots_found != L)
             return -1;