[gs-commits] ghostpdl branch, master, updated. jbig2dec-0.14-1913-g1a5a05c

The ghostpdl branch, master has been updated
       via  1a5a05cf164f6657e3cc52f6fa31524ed190b981 (commit)
       via  9a26c1ee0ef8db26ba79f6804a4f09e1c88cb234 (commit)
       via  9d8f69e1e37475775917e71ba9bf82b7a2098942 (commit)
       via  09d9c492f135ceeb6d95323c1b340b1fc03f15ad (commit)
       via  d79e80b43f388d1e9dd53d86466e04bdb2e6be25 (commit)
       via  b74cf2eff085b9270d26818e9064450ac4da41f9 (commit)
       via  763a96187a286432e3c90b564a2031278e3688d0 (commit)
      from  1759596a7499d27e3d289bbff4c45f9206ad4798 (commit)

----------------------------------------------------------------------
commit 1a5a05cf164f6657e3cc52f6fa31524ed190b981
Author: Julian Smith <[email protected]>
Date:   Wed Nov 20 11:04:43 2019 +0000

    Coverity 95049: stop coverity taints for jbig2_get_int16() etc.

diff --git a/jbig2dec/jbig2.c b/jbig2dec/jbig2.c
index 326d8cb..f25fb69 100644
--- a/jbig2dec/jbig2.c
+++ b/jbig2dec/jbig2.c
@@ -179,27 +179,32 @@ jbig2_ctx_new_imp(Jbig2Allocator *allocator, Jbig2Options options, Jbig2GlobalCt
 #define get_int16(bptr)\
     (((int)get_uint16(bptr) ^ 0x8000) - 0x8000)
 
+/* coverity[ -tainted_data_return ] */
+/* coverity[ -tainted_data_argument : arg-0 ] */
 int16_t
 jbig2_get_int16(const byte *bptr)
 {
     return get_int16(bptr);
 }
 
+/* coverity[ -tainted_data_return ] */
+/* coverity[ -tainted_data_argument : arg-0 ] */
 uint16_t
 jbig2_get_uint16(const byte *bptr)
 {
     return get_uint16(bptr);
 }
 
-// coverity[ -tainted_data_return ]
+/* coverity[ -tainted_data_return ] */
+/* coverity[ -tainted_data_argument : arg-0 ] */
 int32_t
 jbig2_get_int32(const byte *bptr)
 {
     return ((int32_t) get_int16(bptr) << 16) | get_uint16(bptr + 2);
 }
 
-// coverity[ -tainted_data_return ]
-// coverity[ -tainted_data_argument : arg-0 ]
+/* coverity[ -tainted_data_return ] */
+/* coverity[ -tainted_data_argument : arg-0 ] */
 uint32_t
 jbig2_get_uint32(const byte *bptr)
 {

----------------------------------------------------------------------
commit 9a26c1ee0ef8db26ba79f6804a4f09e1c88cb234
Author: Julian Smith <[email protected]>
Date:   Wed Nov 20 10:34:33 2019 +0000

    Coverity 350210: removed superflous extra param to jbig2_error().

diff --git a/jbig2dec/jbig2_segment.c b/jbig2dec/jbig2_segment.c
index 9c47f63..2f2ca7e 100644
--- a/jbig2dec/jbig2_segment.c
+++ b/jbig2dec/jbig2_segment.c
@@ -87,7 +87,7 @@ jbig2_parse_segment_header(Jbig2Ctx *ctx, uint8_t *buf, size_t buf_size, size_t
     referred_to_segment_size = result->number <= 256 ? 1 : result->number <= 65536 ? 2 : 4;     /* 7.2.5 */
     pa_size = result->flags & 0x40 ? 4 : 1;     /* 7.2.6 */
     if (offset + referred_to_segment_count * referred_to_segment_size + pa_size + 4 > buf_size) {
-        jbig2_error(ctx, JBIG2_SEVERITY_FATAL, result->number, "insufficient data to parse segment header", -1);
+        jbig2_error(ctx, JBIG2_SEVERITY_FATAL, result->number, "insufficient data to parse segment header");
         jbig2_free(ctx->allocator, result);
         return NULL;
     }

----------------------------------------------------------------------
commit 9d8f69e1e37475775917e71ba9bf82b7a2098942
Author: Julian Smith <[email protected]>
Date:   Wed Nov 20 10:24:09 2019 +0000

    Coverity 350166: stop coverity taint warnings for get_u32_big_endian().

diff --git a/base/gsiorom.c b/base/gsiorom.c
index 6f76427..6516568 100644
--- a/base/gsiorom.c
+++ b/base/gsiorom.c
@@ -83,6 +83,8 @@ gs_private_st_ptrs1(st_romfs_file_enum, struct romfs_file_enum_s, "romfs_file_en
 
 static uint32_t get_u32_big_endian(const uint32_t *a);
 
+/* coverity[ -tainted_data_return ] */
+/* coverity[ -tainted_data_argument : arg-0 ] */
 static uint32_t
 get_u32_big_endian(const uint32_t *a)
 {

----------------------------------------------------------------------
commit 09d9c492f135ceeb6d95323c1b340b1fc03f15ad
Author: Julian Smith <[email protected]>
Date:   Wed Nov 20 10:19:46 2019 +0000

    Coverity 341108: removed special coverity comment that didn't work.

diff --git a/base/gp_unifs.c b/base/gp_unifs.c
index 75e49a1..e37bcd9 100644
--- a/base/gp_unifs.c
+++ b/base/gp_unifs.c
@@ -128,10 +128,10 @@ gp_open_scratch_file_impl(const gs_memory_t *mem,
 	}
     }
 #else
-    /* Coverity thinks that any use of mktemp() is insecure. But if we reach
-    here then there is no mkstemp() alternative available, so there's not much
-    we can do. So we disable Coverity SECURE_TEMP explicitly. */
-    // coverity[SECURE_TEMP]
+    /* Coverity thinks that any use of mktemp() is insecure. But if we
+    reach here then there is no mkstemp() alternative available, so there's
+    not much we can do. Haven't been able to disable this - e.g. '//
+    coverity[SECURE_TEMP]' doesn't have any affect. */
     mktemp(fname);
     fp = gp_fopentemp(fname, mode);
 #endif

----------------------------------------------------------------------
commit d79e80b43f388d1e9dd53d86466e04bdb2e6be25
Author: Julian Smith <[email protected]>
Date:   Wed Nov 20 10:13:03 2019 +0000

    Coverity 102214: stop coverity worrying about pl_get_int16() etc.
    
    These fns use byte swapping, which makes coverity think that they return
    tainted data, and also that they taint the input buffer.

diff --git a/pcl/pl/plvalue.c b/pcl/pl/plvalue.c
index 86b6083..c1485e3 100644
--- a/pcl/pl/plvalue.c
+++ b/pcl/pl/plvalue.c
@@ -25,24 +25,32 @@
 #define get_int16(bptr)\
   (((int)get_uint16(bptr) ^ 0x8000) - 0x8000)
 
+/* coverity[ -tainted_data_return ] */
+/* coverity[ -tainted_data_argument : arg-0 ] */
 int
 pl_get_int16(const byte * bptr)
 {
     return get_int16(bptr);
 }
 
+/* coverity[ -tainted_data_return ] */
+/* coverity[ -tainted_data_argument : arg-0 ] */
 uint
 pl_get_uint16(const byte * bptr)
 {
     return get_uint16(bptr);
 }
 
+/* coverity[ -tainted_data_return ] */
+/* coverity[ -tainted_data_argument : arg-0 ] */
 long
 pl_get_int32(const byte * bptr)
 {
     return ((long)get_int16(bptr) << 16) | get_uint16(bptr + 2);
 }
 
+/* coverity[ -tainted_data_return ] */
+/* coverity[ -tainted_data_argument : arg-0 ] */
 ulong
 pl_get_uint32(const byte * bptr)
 {

----------------------------------------------------------------------
commit b74cf2eff085b9270d26818e9064450ac4da41f9
Author: Julian Smith <[email protected]>
Date:   Tue Nov 19 17:58:10 2019 +0000

    Coverity 350199: try to stop coverity from thinking skip_white_pixels() taints buffer.

diff --git a/base/scfe.c b/base/scfe.c
index 3bdd4f6..182cfe5 100644
--- a/base/scfe.c
+++ b/base/scfe.c
@@ -380,6 +380,8 @@ s_CFE_process(stream_state * st, stream_cursor_read * pr,
 }
 
 /* Encode a 1-D scan line. */
+/* Attempt to stop coverity thinking skip_white_pixels() taints lbuf:*/
+/* coverity [ -tainted_scalar ] */
 static void
 cf_encode_1d(stream_CFE_state * ss, const byte * lbuf, stream_cursor_write * pw)
 {

----------------------------------------------------------------------
commit 763a96187a286432e3c90b564a2031278e3688d0
Author: Julian Smith <[email protected]>
Date:   Tue Nov 19 17:30:52 2019 +0000

    Coverity 350190, 350208: make raster unsigned, to avoid sign extension issue.

diff --git a/base/gsovrc.c b/base/gsovrc.c
index d29808d..3407e93 100644
--- a/base/gsovrc.c
+++ b/base/gsovrc.c
@@ -966,7 +966,8 @@ overprint_copy_planes(gx_device * dev, const byte * data, int data_x, int raster
     byte *                  gb_buff = 0;
     gs_get_bits_params_t    gb_params;
     gs_int_rect             gb_rect;
-    int                     code = 0, raster;
+    int                     code = 0;
+    unsigned int            raster;
     int                     byte_depth;
     int                     depth;
     uchar                   num_comps;
@@ -1078,7 +1079,8 @@ overprint_fill_rectangle_hl_color(gx_device *dev,
     byte *                  gb_buff = 0;
     gs_get_bits_params_t    gb_params;
     gs_int_rect             gb_rect;
-    int                     code = 0, raster;
+    int                     code = 0;
+    unsigned int            raster;
     int                     byte_depth;
     int                     depth;
     uchar                   num_comps;


Summary of changes:
 base/gp_unifs.c          |  8 ++++----
 base/gsiorom.c           |  2 ++
 base/gsovrc.c            |  6 ++++--
 base/scfe.c              |  2 ++
 jbig2dec/jbig2.c         | 11 ++++++++---
 jbig2dec/jbig2_segment.c |  2 +-
 pcl/pl/plvalue.c         |  8 ++++++++
 7 files changed, 29 insertions(+), 10 deletions(-)