CID 340857: Null pointer dereferences (NULL_RETURNS)

CID 340856: (CONSTANT_EXPRESSION_RESULT)

Fixes: 3be12ea52ad8 ("test/compress: improve debug trace setup")

Signed-off-by: Adam Dybkowski <adamx.dybkow...@intel.com>
---
 app/test/test_compressdev.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/test/test_compressdev.c b/app/test/test_compressdev.c
index 65889c242..992eac8e0 100644
--- a/app/test/test_compressdev.c
+++ b/app/test/test_compressdev.c
@@ -755,6 +755,12 @@ test_deflate_comp_decomp(const struct interim_data_params 
*int_data,
        char *contig_buf = NULL;
        uint64_t compress_checksum[num_bufs];
 
+       if (capa == NULL) {
+               RTE_LOG(ERR, USER1,
+                       "Compress device does not support DEFLATE\n");
+               return -1;
+       }
+
        /* Initialize all arrays to NULL */
        memset(uncomp_bufs, 0, sizeof(struct rte_mbuf *) * num_bufs);
        memset(comp_bufs, 0, sizeof(struct rte_mbuf *) * num_bufs);
@@ -975,7 +981,7 @@ test_deflate_comp_decomp(const struct interim_data_params 
*int_data,
                enum rte_comp_huffman huffman_type =
                        compress_xform->deflate.huffman;
                char engine[] = "zlib (directly, not PMD)";
-               if (zlib_dir != ZLIB_COMPRESS || zlib_dir != ZLIB_ALL)
+               if (zlib_dir != ZLIB_COMPRESS && zlib_dir != ZLIB_ALL)
                        strlcpy(engine, "PMD", sizeof(engine));
 
                RTE_LOG(DEBUG, USER1, "Buffer %u compressed by %s from %u to"
@@ -1211,7 +1217,7 @@ test_deflate_comp_decomp(const struct interim_data_params 
*int_data,
        for (i = 0; i < num_bufs; i++) {
                priv_data = (struct priv_op_data *)(ops_processed[i] + 1);
                char engine[] = "zlib, (directly, no PMD)";
-               if (zlib_dir != ZLIB_DECOMPRESS || zlib_dir != ZLIB_ALL)
+               if (zlib_dir != ZLIB_DECOMPRESS && zlib_dir != ZLIB_ALL)
                        strlcpy(engine, "pmd", sizeof(engine));
                RTE_LOG(DEBUG, USER1,
                        "Buffer %u decompressed by %s from %u to %u bytes\n",
-- 
2.17.1

Reply via email to