From: Adam Dybkowski Date: Tue, 23 Jul 2019 10:53:49 +0000 (+0200) Subject: test/compress: fix some checks X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=98af2ecacd19897591f13dc73e73422d2f2079a2;p=dpdk.git test/compress: fix some checks CID 340857: Null pointer dereferences (NULL_RETURNS) CID 340856: (CONSTANT_EXPRESSION_RESULT) Coverity issue: 340856, 340857 Fixes: 3be12ea52ad8 ("test/compress: improve debug trace setup") Cc: stable@dpdk.org Signed-off-by: Adam Dybkowski Acked-by: Fiona Trahe --- diff --git a/app/test/test_compressdev.c b/app/test/test_compressdev.c index 65889c242f..992eac8e01 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",