fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 00:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

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

v5: correct spaces and empty lines

Reviewed-by: Brian Paul <brianp@vmware.com>(v4)
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> (v1)
Signed-off-by: Gert Wollny <gw.fossdev@gmail.com>
This commit is contained in:
Gert Wollny 2017-09-14 12:49:07 +02:00 • committed by Brian Paul
parent ee48e3acb8
commit ad1990629e
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/mesa/state_tracker/tests/test_glsl_to_tgsi_lifetime.cpp
View file

@ -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);
}