Mesa (master): mesa/st/tests: Fix zero-byte allocation leaks

[Brian Paul]

Module: Mesa
Branch: master
Commit: ad1990629e4d855101977f39319db47f51daf536
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ad1990629e4d855101977f39319db47f51daf536

Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Thu Sep 14 12:49:07 2017 +0200

mesa/st/tests: Fix zero-byte allocation leaks

Don't allocate a zero-sized array, when no texture offsets are given.

v5: correct spaces and empty lines

Reviewed-by: Brian Paul <brianp at vmware.com>(v4)
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com> (v1)
Signed-off-by: Gert Wollny <gw.fossdev at gmail.com>

---

 .../tests/test_glsl_to_tgsi_lifetime.cpp           | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/mesa/state_tracker/tests/test_glsl_to_tgsi_lifetime.cpp b/src/mesa/state_tracker/tests/test_glsl_to_tgsi_lifetime.cpp
index 93f4020ebf..1c8b9acfa4 100644
--- a/src/mesa/state_tracker/tests/test_glsl_to_tgsi_lifetime.cpp
+++ b/src/mesa/state_tracker/tests/test_glsl_to_tgsi_lifetime.cpp
@@ -1374,10 +1374,14 @@ MockShader::MockShader(const vector<MockCodelineWithSwizzle>& source):
          next_instr->dst[k] = create_dst_register(i.dst[k].first, i.dst[k].second);
       }
       next_instr->tex_offset_num_offset = i.tex_offsets.size();
-      next_instr->tex_offsets = new st_src_reg[i.tex_offsets.size()];
-      for (unsigned k = 0; k < i.tex_offsets.size(); ++k) {
-         next_instr->tex_offsets[k] = create_src_register(i.tex_offsets[k].first,
-                                                          i.tex_offsets[k].second);
+      if (next_instr->tex_offset_num_offset > 0) {
+         next_instr->tex_offsets = new st_src_reg[i.tex_offsets.size()];
+         for (unsigned k = 0; k < i.tex_offsets.size(); ++k) {
+            next_instr->tex_offsets[k] = create_src_register(i.tex_offsets[k].first,
+                                                             i.tex_offsets[k].second);
+         }
+      } else {
+         next_instr->tex_offsets = nullptr;
       }
       program->push_tail(next_instr);
    }
@@ -1407,9 +1411,13 @@ MockShader::MockShader(const vector<MockCodeline>& source):
          next_instr->dst[k] = create_dst_register(i.dst[k]);
       }
       next_instr->tex_offset_num_offset = i.tex_offsets.size();
-      next_instr->tex_offsets = new st_src_reg[i.tex_offsets.size()];
-      for (unsigned k = 0; k < i.tex_offsets.size(); ++k) {
-         next_instr->tex_offsets[k] = create_src_register(i.tex_offsets[k]);
+      if (next_instr->tex_offset_num_offset > 0) {
+         next_instr->tex_offsets = new st_src_reg[i.tex_offsets.size()];
+         for (unsigned k = 0; k < i.tex_offsets.size(); ++k) {
+            next_instr->tex_offsets[k] = create_src_register(i.tex_offsets[k]);
+         }
+      } else {
+         next_instr->tex_offsets = nullptr;
       }
       program->push_tail(next_instr);
    }