i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgutenprint: channel.c: Defer assigment after NULL check

Browse Source 
To avoid hypothetical NULL dereference. CID 10821, CID 10822

(patch sent upstream)
This commit is contained in:
Philippe Saint-Pierre
2011-12-29 15:51:38 -05:00
parent 3ad5b0818e
commit 5e783d6ad7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/print/libgutenprint/src/main/channel.c
+4 -2
View File
@@ -736,9 +736,10 @@ limit_ink(const stp_vars_t *v)
int i; int i;
int retval = 0; int retval = 0;
stpi_channel_group_t *cg = get_channel_group(v); stpi_channel_group_t *cg = get_channel_group(v);
unsigned short *ptr = cg->output_data; unsigned short *ptr;
if (!cg || cg->ink_limit == 0 || cg->ink_limit >= cg->max_density) if (!cg || cg->ink_limit == 0 || cg->ink_limit >= cg->max_density)
return 0; return 0;
ptr = cg->output_data;
for (i = 0; i < cg->width; i++) for (i = 0; i < cg->width; i++)
{ {
int total_ink = ink_sum(ptr, cg->total_channels); int total_ink = ink_sum(ptr, cg->total_channels);
@@ -1065,11 +1066,12 @@ static void
generate_gloss(const stp_vars_t *v, unsigned *zero_mask) generate_gloss(const stp_vars_t *v, unsigned *zero_mask)
{ {
stpi_channel_group_t *cg = get_channel_group(v); stpi_channel_group_t *cg = get_channel_group(v);
unsigned short *output = cg->output_data; unsigned short *output;
unsigned gloss_mask; unsigned gloss_mask;
int i, j, k; int i, j, k;
if (!cg || cg->gloss_channel == -1 || cg->gloss_limit <= 0) if (!cg || cg->gloss_channel == -1 || cg->gloss_limit <= 0)
return; return;
output = cg->output_data;
gloss_mask = ~(1 << cg->gloss_physical_channel); gloss_mask = ~(1 << cg->gloss_physical_channel);
for (i = 0; i < cg->width; i++) for (i = 0; i < cg->width; i++)
{ {