Fix workload api memory leak (crustio#222)

Author: TonyCode2012

src/app/http/ApiHandler.h

@@ -192,20 +192,14 @@ void ApiHandler::http_handler(beast::string_view /*doc_root*/,
             json::JSON n_files_json;
             if (files_json.JSONType() == json::JSON::Class::Object)
             {
-                char buf1[128];
-                char buf2[128];
+                char buf[128];
                 for (auto it = files_json.ObjectRange().begin(); it != files_json.ObjectRange().end(); it++)
                 {
-                    std::string item_str = it->second.ToString();
-                    remove_char(item_str, '\\');
-                    json::JSON item_json = json::JSON::Load(item_str);
-                    memset(buf1, 0, sizeof(buf1));
-                    memset(buf2, 0, sizeof(buf2));
-                    sprintf(buf1, "  \"hash\"        : \"%s\", \"size\"        : %ld, ",
-                            item_json["old_hash"].ToString().c_str(), item_json["old_size"].ToInt());
-                    sprintf(buf2, "  \"sealed_hash\" : \"%s\", \"sealed_size\" : %ld",
+                    json::JSON item_json = it->second;
+                    memset(buf, 0, sizeof(buf));
+                    sprintf(buf, "  \"sealed_hash\" : \"%s\", \"sealed_size\" : %ld  ",
                             (it->first).c_str(), item_json["sealed_size"].ToInt());
-                    std::string tmp_str = std::string("{") + JSON_NL + std::string(buf1) + JSON_NL + std::string(buf2) + JSON_NL + "}";
+                    std::string tmp_str = std::string("{") + std::string(buf) + "}";
                     std::string fstatus = item_json["status"].ToString();
                     n_files_json[fstatus]["detail"].append(tmp_str);
                     n_files_json[fstatus]["number"] = n_files_json[fstatus]["number"].ToInt() + 1;

src/enclave/workload/Workload.cpp

@@ -57,47 +57,46 @@ Workload::~Workload()
  */
 std::string Workload::get_workload(void)
 {
-    crust_status_t crust_status = CRUST_SUCCESS;
     sgx_sha256_hash_t srd_root;
     uint64_t srd_workload = 0;
-    json::JSON wl_json;
     json::JSON md_json;
     memset(srd_root, 0, sizeof(sgx_sha256_hash_t));
+    std::string wl_str;
 
     // ----- workload info ----- //
     id_get_metadata(md_json);
-    // Srd info
-    this->get_srd_info(&srd_root, &srd_workload, md_json);
-    wl_json[WL_SRD][WL_SRD_ROOT_HASH] = hexstring_safe(srd_root, HASH_LENGTH);
-    wl_json[WL_SRD][WL_SRD_SPACE] = srd_workload / 1024 / 1024 / 1024;
-    wl_json[WL_SRD][WL_SRD_REMAINING_TASK] = get_srd_change();
     // file info
+    wl_str.append("{");
+    wl_str.append("\"").append(WL_FILES).append("\":{");
     if (md_json.hasKey(ID_FILE) && md_json[ID_FILE].size() > 0)
     {
         for (int i = 0; i < md_json[ID_FILE].size(); i++)
         {
-            json::JSON tmp_json;
-            tmp_json[WL_FILE_SEALED_SIZE] = md_json[ID_FILE][i][FILE_SIZE];
-            tmp_json[WL_FILE_STATUS] = md_json[ID_FILE][i][FILE_STATUS];
-            // Get old hash
-            uint8_t *p_meta = NULL;
-            size_t meta_len = 0;
-            crust_status = persist_get_unsafe((md_json[ID_FILE][i][FILE_HASH].ToString()+"_meta").c_str(), &p_meta, &meta_len);
-            if (CRUST_SUCCESS == crust_status && p_meta != NULL)
+            std::string tmp_str = "{";
+            tmp_str.append("\"").append(WL_FILE_SEALED_SIZE).append("\":")
+                .append(std::to_string(md_json[ID_FILE][i][FILE_SIZE].ToInt())).append(",");
+            tmp_str.append("\"").append(WL_FILE_STATUS).append("\":")
+                .append("\"").append(md_json[ID_FILE][i][FILE_STATUS].ToString()).append("\"}");
+            wl_str.append("\"").append(md_json[ID_FILE][i][FILE_HASH].ToString()).append("\":").append(tmp_str);
+            if (i != md_json[ID_FILE].size() - 1)
             {
-                json::JSON org_file_json = json::JSON::Load(std::string(reinterpret_cast<char*>(p_meta), meta_len));
-                free(p_meta);
-                tmp_json[WL_FILE_OLD_HASH] = org_file_json[FILE_OLD_HASH].ToString();
-                tmp_json[WL_FILE_OLD_SIZE] = org_file_json[FILE_OLD_SIZE].ToInt();
+                wl_str.append(",");
             }
-            std::string tmp_str = tmp_json.dump();
-            remove_char(tmp_str, '\n');
-            wl_json[WL_FILES][md_json[ID_FILE][i][FILE_HASH].ToString()] = tmp_str;
         }
     }
+    wl_str.append("},");
+    // Srd info
+    this->get_srd_info(&srd_root, &srd_workload, md_json);
+    wl_str.append("\"").append(WL_SRD).append("\":{");
+    wl_str.append("\"").append(WL_SRD_ROOT_HASH).append("\":")
+        .append("\"").append(hexstring_safe(srd_root, HASH_LENGTH)).append("\",");
+    wl_str.append("\"").append(WL_SRD_SPACE).append("\":")
+        .append("\"").append(std::to_string(srd_workload / 1024 / 1024 / 1024)).append("\",");
+    wl_str.append("\"").append(WL_SRD_REMAINING_TASK).append("\":")
+        .append("\"").append(std::to_string(get_srd_change())).append("\"}");
+    wl_str.append("}");
 
     // Store workload
-    std::string wl_str = wl_json.dump();
     store_large_data(wl_str.c_str(), wl_str.size(), ocall_store_workload);
 
     return wl_str;
@@ -161,6 +160,7 @@ crust_status_t Workload::get_srd_info(sgx_sha256_hash_t *srd_root_out, uint64_t
                 return CRUST_MALLOC_FAILED;
             }
             memcpy(hashs + hashs_len, hash_u, HASH_LENGTH);
+            free(hash_u);
             hashs_len += HASH_LENGTH;
         }
     }
@@ -290,6 +290,7 @@ crust_status_t Workload::restore_srd(json::JSON g_hashs)
                 clean_data();
                 return CRUST_UNEXPECTED_ERROR;
             }
+            free(g_hash);
             this->srd_path2hashs_m[it->first].push_back(g_hash);
         }
     }