[CodeClean] fix svace issue

Fix svace issue, prevent index error case.

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/ext/nnstreamer/extra/nnstreamer_protobuf.cc b/ext/nnstreamer/extra/nnstreamer_protobuf.cc
index 136e9e9..61f0b34 100644 (file)
--- a/ext/nnstreamer/extra/nnstreamer_protobuf.cc
+++ b/ext/nnstreamer/extra/nnstreamer_protobuf.cc
@@ -43,16 +43,16 @@ gst_tensor_decoder_protobuf (const GstTensorsConfig *config,
   guint num_tensors;
   gboolean is_flexible;
   GstTensorMetaInfo meta;
-  GstTensorsConfig pbd_config;
+  GstTensorInfo *_info;
 
   if (!config || !input || !outbuf) {
     ml_loge ("NULL parameter is passed to tensor_decoder::protobuf");
     return GST_FLOW_ERROR;
   }
-  gst_tensors_config_copy (&pbd_config, config);
-  is_flexible = gst_tensors_config_is_flexible (&pbd_config);
 
-  num_tensors = pbd_config.info.num_tensors;
+  is_flexible = gst_tensors_config_is_flexible (config);
+
+  num_tensors = config->info.num_tensors;
   if (num_tensors <= 0 || num_tensors > NNS_TENSOR_SIZE_LIMIT) {
     ml_loge ("The number of input tenosrs "
              "exceeds more than NNS_TENSOR_SIZE_LIMIT, %s",
@@ -67,33 +67,27 @@ gst_tensor_decoder_protobuf (const GstTensorsConfig *config,
     return GST_FLOW_ERROR;
   }
 
-  fr->set_rate_n (pbd_config.rate_n);
-  fr->set_rate_d (pbd_config.rate_d);
+  fr->set_rate_n (config->rate_n);
+  fr->set_rate_d (config->rate_d);
 
   tensors.set_format (
-      (nnstreamer::protobuf::Tensors::Tensor_format) pbd_config.info.format);
+      (nnstreamer::protobuf::Tensors::Tensor_format) config->info.format);
 
   for (unsigned int i = 0; i < num_tensors; ++i) {
     nnstreamer::protobuf::Tensor *tensor = tensors.add_tensor ();
-    gchar *name = NULL;
+
+    _info = gst_tensors_info_get_nth_info ((GstTensorsInfo *) &config->info, i);
 
     if (is_flexible) {
       gst_tensor_meta_info_parse_header (&meta, input[i].data);
-      gst_tensor_meta_info_convert (&meta, &pbd_config.info.info[i]);
-    }
-    name = pbd_config.info.info[i].name;
-
-    if (name == NULL) {
-      tensor->set_name ("");
-    } else {
-      tensor->set_name (name);
+      gst_tensor_meta_info_convert (&meta, _info);
     }
 
-    tensor->set_type (
-        (nnstreamer::protobuf::Tensor::Tensor_type) pbd_config.info.info[i].type);
+    tensor->set_name (_info->name ? _info->name : "");
+    tensor->set_type ((nnstreamer::protobuf::Tensor::Tensor_type) _info->type);
 
     for (int j = 0; j < NNS_TENSOR_RANK_LIMIT; ++j) {
-      tensor->add_dimension (pbd_config.info.info[i].dimension[j]);
+      tensor->add_dimension (_info->dimension[j]);
     }
 
     tensor->set_data (input[i].data, (int) input[i].size);

diff --git a/ext/nnstreamer/tensor_converter/tensor_converter_flexbuf.cc b/ext/nnstreamer/tensor_converter/tensor_converter_flexbuf.cc
index 14544b1..cbd6674 100644 (file)
--- a/ext/nnstreamer/tensor_converter/tensor_converter_flexbuf.cc
+++ b/ext/nnstreamer/tensor_converter/tensor_converter_flexbuf.cc
@@ -137,7 +137,7 @@ flxc_convert (GstBuffer *in_buf, GstTensorsConfig *config, void *priv_data)
       _info->dimension[j] = dim[j].AsInt32 ();
     }
     flexbuffers::Blob tensor_data = tensor[3].AsBlob ();
-    mem_size = gst_tensor_info_get_size (&config->info.info[i]);
+    mem_size = gst_tensor_info_get_size (_info);
     if (gst_tensors_config_is_flexible (config)) {
       GstTensorMetaInfo meta;
       gst_tensor_meta_info_parse_header (&meta, (gpointer) tensor_data.data ());

diff --git a/gst/nnstreamer/nnstreamer_plugin_api_impl.c b/gst/nnstreamer/nnstreamer_plugin_api_impl.c
index 688e94e..4b59e8d 100644 (file)
--- a/gst/nnstreamer/nnstreamer_plugin_api_impl.c
+++ b/gst/nnstreamer/nnstreamer_plugin_api_impl.c
@@ -592,7 +592,7 @@ gst_tensor_buffer_from_config (GstBuffer * in, GstTensorsConfig * config)
       GstTensorMetaInfo meta;
       gpointer h = map.data + offset;
 
-      if (num >= NNS_TENSOR_SIZE_LIMIT - 1) {
+      if (num >= NNS_TENSOR_MEMORY_MAX - 1) {
         /* Suppose remained memory may include extra tensors. */
         mem_size[num++] = total - offset;
         break;

diff --git a/tests/common/unittest_common.cc b/tests/common/unittest_common.cc
index e72236c..5fe1d27 100644 (file)
--- a/tests/common/unittest_common.cc
+++ b/tests/common/unittest_common.cc
@@ -565,6 +565,7 @@ fill_tensors_config_for_test (GstTensorsConfig *conf1, GstTensorsConfig *conf2)
 TEST (commonTensorInfo, size01_p)
 {
   GstTensorsInfo info1, info2;
+  GstTensorInfo *_info;
   gsize size1, size2;
   guint i;
 
@@ -577,7 +578,8 @@ TEST (commonTensorInfo, size01_p)
 
   size1 = 0;
   for (i = 0; i < info2.num_tensors; i++) {
-    size1 += gst_tensor_info_get_size (&info2.info[i]);
+    _info = gst_tensors_info_get_nth_info (&info2, i);
+    size1 += gst_tensor_info_get_size (_info);
   }
 
   size2 = gst_tensors_info_get_size (&info2, -1);

diff --git a/tests/nnstreamer_converter/unittest_converter.cc b/tests/nnstreamer_converter/unittest_converter.cc
index fe28434..afcb917 100644 (file)
--- a/tests/nnstreamer_converter/unittest_converter.cc
+++ b/tests/nnstreamer_converter/unittest_converter.cc
@@ -33,6 +33,7 @@ tensor_converter_custom_cb (GstBuffer *in_buf, void *data, GstTensorsConfig *con
   guint mem_size;
   gpointer mem_data;
   guint *received = (guint *) data;
+  GstTensorInfo *_info;
 
   if (!in_buf || !config)
     return NULL;
@@ -59,12 +60,17 @@ tensor_converter_custom_cb (GstBuffer *in_buf, void *data, GstTensorsConfig *con
   for (guint i = 0; i < config->info.num_tensors; i++) {
     gchar *tensor_key = g_strdup_printf ("tensor_%d", i);
     flexbuffers::Vector tensor = tensors[tensor_key].AsVector ();
-    config->info.info[i].name = g_strdup (tensor[0].AsString ().c_str ());
-    config->info.info[i].type = (tensor_type) tensor[1].AsInt32 ();
+    flexbuffers::String _name = tensor[0].AsString ();
+    const gchar *name = _name.c_str ();
+
+    _info = gst_tensors_info_get_nth_info (&config->info, i);
+
+    _info->name = (name && strlen (name) > 0) ? g_strdup (name) : NULL;
+    _info->type = (tensor_type) tensor[1].AsInt32 ();
 
     flexbuffers::TypedVector dim = tensor[2].AsTypedVector ();
     for (guint j = 0; j < NNS_TENSOR_RANK_LIMIT; j++) {
-      config->info.info[i].dimension[j] = dim[j].AsInt32 ();
+      _info->dimension[j] = dim[j].AsInt32 ();
     }
     flexbuffers::Blob tensor_data = tensor[3].AsBlob ();
     mem_size = tensor_data.size ();

diff --git a/tests/nnstreamer_example/custom_example_passthrough/nnstreamer_customfilter_example_passthrough_variable.c b/tests/nnstreamer_example/custom_example_passthrough/nnstreamer_customfilter_example_passthrough_variable.c
index 4acf6c9..5b21cc3 100644 (file)
--- a/tests/nnstreamer_example/custom_example_passthrough/nnstreamer_customfilter_example_passthrough_variable.c
+++ b/tests/nnstreamer_example/custom_example_passthrough/nnstreamer_customfilter_example_passthrough_variable.c
@@ -61,6 +61,8 @@ set_inputDim (void *private_data, const GstTensorFilterProperties * prop,
     const GstTensorsInfo * in_info, GstTensorsInfo * out_info)
 {
   unsigned int i, t;
+  GstTensorInfo *_in, *_out;
+
   UNUSED (prop);
   UNUSED (private_data);
 
@@ -70,11 +72,14 @@ set_inputDim (void *private_data, const GstTensorFilterProperties * prop,
   out_info->num_tensors = in_info->num_tensors;
 
   for (t = 0; t < in_info->num_tensors; t++) {
+    _in = gst_tensors_info_get_nth_info ((GstTensorsInfo *) in_info, t);
+    _out = gst_tensors_info_get_nth_info (out_info, t);
+
     for (i = 0; i < NNS_TENSOR_RANK_LIMIT; i++) {
-      out_info->info[t].dimension[i] = in_info->info[t].dimension[i];
+      _out->dimension[i] = _in->dimension[i];
     }
 
-    out_info->info[t].type = in_info->info[t].type;
+    _out->type = _in->type;
   }
 
   return 0;
@@ -97,7 +102,7 @@ pt_invoke (void *private_data, const GstTensorFilterProperties * prop,
   assert (output);
 
   for (t = 0; t < prop->output_meta.num_tensors; t++) {
-    size = gst_tensor_info_get_size (&prop->output_meta.info[t]);
+    size = gst_tensors_info_get_size (&prop->output_meta, t);
 
     assert (input[t].data != output[t].data);
     memcpy (output[t].data, input[t].data, size);

diff --git a/tests/nnstreamer_example/custom_example_tensorrt/nnstreamer_customfilter_example_tensorrt_reshape.cc b/tests/nnstreamer_example/custom_example_tensorrt/nnstreamer_customfilter_example_tensorrt_reshape.cc
index 54109a6..84a0493 100644 (file)
--- a/tests/nnstreamer_example/custom_example_tensorrt/nnstreamer_customfilter_example_tensorrt_reshape.cc
+++ b/tests/nnstreamer_example/custom_example_tensorrt/nnstreamer_customfilter_example_tensorrt_reshape.cc
@@ -32,6 +32,11 @@
 #include <NvInferRuntimeCommon.h>
 #include <cuda_runtime_api.h>
 
+/**
+ * @brief Min rank in this example (TensorRT uses the NCHW data format).
+ */
+#define MIN_RANK (4)
+
 using Severity = nvinfer1::ILogger::Severity;
 
 /** @brief a global object of ILogger */
@@ -349,19 +354,19 @@ pt_init (const GstTensorFilterProperties *prop)
 
   if (prop->custom_properties && strlen (prop->custom_properties) > 0) {
     gchar **strv = g_strsplit (prop->custom_properties, ":", -1);
-    gsize i;
+    guint i;
 
-    if (g_strv_length (strv) != NNS_TENSOR_RANK_LIMIT - 1) {
+    if (g_strv_length (strv) != MIN_RANK - 1) {
       g_critical ("Please specify a proper 'custom' property");
       goto err;
     }
 
     info.num_tensors = 1;
-    for (i = 0; i < NNS_TENSOR_RANK_LIMIT - 1; i++) {
+    for (i = 0; i < MIN_RANK - 1; i++) {
       info.info[0].type = _NNS_FLOAT32;
       info.info[0].dimension[i] = (int) g_ascii_strtoll (strv[i], NULL, 10);
     }
-    info.info[0].dimension[NNS_TENSOR_RANK_LIMIT - 1] = 1;
+    info.info[0].dimension[MIN_RANK - 1] = 1;
 
     g_strfreev (strv);
   } else {

diff --git a/tests/nnstreamer_plugins/unittest_plugins.cc b/tests/nnstreamer_plugins/unittest_plugins.cc
index ed446a4..6498e51 100644 (file)
--- a/tests/nnstreamer_plugins/unittest_plugins.cc
+++ b/tests/nnstreamer_plugins/unittest_plugins.cc
@@ -6801,7 +6801,7 @@ TEST (testStreamBuffers, tensorsNormal)
     gst_tensor_parse_dimension ("3:4:2:2", config.info.info[1].dimension);
 
     for (i = 0; i < config.info.num_tensors; i++) {
-      input[i].size = gst_tensor_info_get_size (&config.info.info[i]);
+      input[i].size = gst_tensors_info_get_size (&config.info, i);
       input[i].data = g_malloc0 (input[0].size);
       memcpy (input[i].data, aggr_test_frames[i], input[i].size);
     }

diff --git a/tools/development/nnstreamerCodeGenCustomFilter.py b/tools/development/nnstreamerCodeGenCustomFilter.py
index 5149d2b..33e36e8 100644 (file)
--- a/tools/development/nnstreamerCodeGenCustomFilter.py
+++ b/tools/development/nnstreamerCodeGenCustomFilter.py
@@ -188,6 +188,7 @@ cg_setInputDim (void * _data, const GstTensorFilterProperties *prop,
                 const GstTensorsInfo * in_info, GstTensorsInfo * out_info)
 {{
   _{sname}_data *data = _data;
+  GstTensorInfo *_in, *_out;
   int i, j;
 
   assert (data);
@@ -199,11 +200,14 @@ cg_setInputDim (void * _data, const GstTensorFilterProperties *prop,
 
   /** @todo Configure the name/type/dimension of tensors in a output frame. */
   for (i = 0; i < out_info->num_tensors; i++) {{
-    out_info->info[i].name = NULL; /** Optional, default is null. Set new memory for tensor name string. */
-    out_info->info[i].type = in_info->info[i].type;
+    _in = gst_tensors_info_get_nth_info ((GstTensorsInfo *) in_info, i);
+    _out = gst_tensors_info_get_nth_info (out_info, i);
+
+    _out->name = NULL; /** Optional, default is null. Set new memory for tensor name string. */
+    _out->type = _in->type;
 
     for (j = 0; j < NNS_TENSOR_RANK_LIMIT; j++)
-      out_info->info[i].dimension[j] = in_info->info[i].dimension[j];
+      _out->dimension[j] = _in->dimension[j];
   }}
 
   return 0;
@@ -242,11 +246,11 @@ cg_allocate_invoke (void * _data, const GstTensorFilterProperties * prop,
 
   /** Allocate output buffer */
   for (i = 0; i < out_info->num_tensors; i++)
-    output[i].data = malloc (gst_tensor_info_get_size (&out_info->info[i]));
+    output[i].data = malloc (gst_tensors_info_get_size (out_info, i));
 
   /** @todo Add your inference code/calls. Fill in the output buffer */
   for (i = 0; i < out_info->num_tensors; i++) {{
-    int s, size = gst_tensor_info_get_size (&out_info->info[i]);
+    int s, size = gst_tensors_info_get_size (out_info, i);
     uint8_t *ptr = output[i].data;
     for (s = 0; s < size; s++)
       ptr[s] = (uint8_t) s;
@@ -297,7 +301,7 @@ cg_invoke (void * _data, const GstTensorFilterProperties *prop,
 
   /** @todo Add your inference code/calls. Fill in the output buffer */
   for (i = 0; i < out_info->num_tensors; i++) {{
-    int s, size = gst_tensor_info_get_size (&out_info->info[i]);
+    int s, size = gst_tensors_info_get_size (out_info, i);
     uint8_t *ptr = output[i].data;
     for (s = 0; s < size; s++)
       ptr[s] = (uint8_t) s;