Skip to content

Commit d44c4fc

Browse files
committed
Address code scanning issues.
1 parent 29a36ff commit d44c4fc

File tree

1 file changed

+26
-16
lines changed

1 file changed

+26
-16
lines changed

tools/ippeveprinter.c

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4124,7 +4124,8 @@ load_legacy_attributes(
41244124
right, top;
41254125
const char *source; // media-source, if any
41264126

4127-
pwg = pwgMediaForPWG(media[i]);
4127+
if ((pwg = pwgMediaForPWG(media[i])) == NULL)
4128+
continue;
41284129

41294130
if (pwg->width < 21000 && pwg->length < 21000)
41304131
{
@@ -4166,7 +4167,8 @@ load_legacy_attributes(
41664167
ipp_t *media_size; // media-size member attribute
41674168

41684169
i ++;
4169-
pwg2 = pwgMediaForPWG(media[i]);
4170+
if ((pwg2 = pwgMediaForPWG(media[i])) == NULL)
4171+
continue;
41704172

41714173
media_size = ippNew();
41724174
ippAddRange(media_size, IPP_TAG_ZERO, "x-dimension", pwg->width, pwg2->width);
@@ -4189,27 +4191,28 @@ load_legacy_attributes(
41894191
}
41904192

41914193
// media-col-default
4192-
pwg = pwgMediaForPWG(ready[0]);
4193-
4194-
if (pwg->width == 21000)
4195-
col = create_media_col(ready[0], "main", "stationery", create_media_size(pwg->width, pwg->length), ppm_color > 0 ? media_bottom_margin_supported_color[1] : media_bottom_margin_supported[0], media_lr_margin_supported[0], media_lr_margin_supported[0], ppm_color > 0 ? media_top_margin_supported_color[1] : media_top_margin_supported[0]);
4196-
else
4197-
col = create_media_col(ready[0], "main", "stationery", create_media_size(pwg->width, pwg->length), ppm_color > 0 ? media_bottom_margin_supported_color[1] : media_bottom_margin_supported[0], media_lr_margin_supported[1], media_lr_margin_supported[1], ppm_color > 0 ? media_top_margin_supported_color[1] : media_top_margin_supported[0]);
4194+
if ((pwg = pwgMediaForPWG(ready[0])) != NULL)
4195+
{
4196+
if (pwg->width == 21000)
4197+
col = create_media_col(ready[0], "main", "stationery", create_media_size(pwg->width, pwg->length), ppm_color > 0 ? media_bottom_margin_supported_color[1] : media_bottom_margin_supported[0], media_lr_margin_supported[0], media_lr_margin_supported[0], ppm_color > 0 ? media_top_margin_supported_color[1] : media_top_margin_supported[0]);
4198+
else
4199+
col = create_media_col(ready[0], "main", "stationery", create_media_size(pwg->width, pwg->length), ppm_color > 0 ? media_bottom_margin_supported_color[1] : media_bottom_margin_supported[0], media_lr_margin_supported[1], media_lr_margin_supported[1], ppm_color > 0 ? media_top_margin_supported_color[1] : media_top_margin_supported[0]);
41984200

4199-
ippAddCollection(attrs, IPP_TAG_PRINTER, "media-col-default", col);
4201+
ippAddCollection(attrs, IPP_TAG_PRINTER, "media-col-default", col);
42004202

4201-
ippDelete(col);
4203+
ippDelete(col);
4204+
}
42024205

42034206
// media-col-ready
4204-
attr = ippAddCollections(attrs, IPP_TAG_PRINTER, "media-col-ready", num_ready, NULL);
4205-
for (i = 0; i < num_ready; i ++)
4207+
for (i = 0, attr = NULL; i < num_ready; i ++)
42064208
{
42074209
int bottom, left, // media-xxx-margins
42084210
right, top;
42094211
const char *source, // media-source
42104212
*type; // media-type
42114213

4212-
pwg = pwgMediaForPWG(ready[i]);
4214+
if ((pwg = pwgMediaForPWG(ready[i])) == NULL)
4215+
continue;
42134216

42144217
if (pwg->width < 21000 && pwg->length < 21000)
42154218
{
@@ -4249,7 +4252,12 @@ load_legacy_attributes(
42494252
}
42504253

42514254
col = create_media_col(ready[i], source, type, create_media_size(pwg->width, pwg->length), bottom, left, right, top);
4252-
ippSetCollection(attrs, &attr, i, col);
4255+
4256+
if (attr)
4257+
ippSetCollection(attrs, &attr, ippGetCount(attr), col);
4258+
else
4259+
attr = ippAddCollection(attrs, IPP_TAG_PRINTER, "media-col-ready", col);
4260+
42534261
ippDelete(col);
42544262
}
42554263

@@ -4277,15 +4285,17 @@ load_legacy_attributes(
42774285
// media-size-supported
42784286
for (i = 0, attr = NULL; i < num_media; i ++)
42794287
{
4280-
pwg = pwgMediaForPWG(media[i]);
4288+
if ((pwg = pwgMediaForPWG(media[i])) == NULL)
4289+
continue;
42814290

42824291
if (!strncmp(media[i], "roll_min_", 9) && i < (num_media - 1))
42834292
{
42844293
// Roll min/max range...
42854294
pwg_media_t *pwg2; // Max size
42864295

42874296
i ++;
4288-
pwg2 = pwgMediaForPWG(media[i]);
4297+
if ((pwg2 = pwgMediaForPWG(media[i])) == NULL)
4298+
continue;
42894299

42904300
col = create_media_size_range(pwg->width, pwg2->width, pwg->length, pwg2->length);
42914301
}

0 commit comments

Comments
 (0)