Use asprintf_hd implementation

Author: ThatHackerDudeFromCyberspace

extractor/main.c

@@ -138,8 +138,7 @@ cJSON* generateChangeRequest(cJSON* json, char* filePath, char* uuid, char* name
 void index_file(char *path, char* filename, bool new) {
     Log("Indexing file: %s/%s\n", path, filename);
 
-    char* full_path;
-    asprintf(&full_path, "%s/%s", path, filename);
+    char* full_path = asprintf_hd("%s/%s", path, filename);
 
     // Generate UUID
     char uuid[37] = {0};
@@ -174,8 +173,7 @@ void index_file(char *path, char* filename, bool new) {
     if (validIcon || header.useHooks) {
         Log("Valid icon OR uses hooks");
         // Create sdr folder
-        char* sdr_path;
-        asprintf(&sdr_path, "%s.sdr", full_path);
+        char* sdr_path = asprintf_hd("%s.sdr", full_path);
         mkdir(sdr_path, 0755);
 
         if (validIcon && strncmp(header.icon, "data:image", strlen("data:image")) == 0) {
@@ -193,8 +191,7 @@ void index_file(char *path, char* filename, bool new) {
             strncpy(fileType, fileTypePointer, fileTypeEndPointer - fileTypePointer);
             fileType[fileTypeEndPointer - fileTypePointer] = '\0';
 
-            char* icon_sdr_path;
-            asprintf(&icon_sdr_path, "%s/icon.%s", sdr_path, fileType);
+            char* icon_sdr_path = asprintf_hd( "%s/icon.%s", sdr_path, fileType);
 
             // Parse the base64
             FILE* file = fopen(icon_sdr_path, "wb");
@@ -263,8 +260,7 @@ void index_file(char *path, char* filename, bool new) {
             const int pid = fork();
             if (pid == 0) {
                 Log("Hello from fork!");
-                char* command;
-                asprintf(&command, "source \"%s\"; on_install;", escapedPath);
+                char* command = asprintf_hd("source \"%s\"; on_install;", escapedPath);
                 Log("Executing command: %s", command);
                 execl("/var/local/mkk/su", "su", "-c", command, NULL);
             } else {
@@ -275,8 +271,7 @@ void index_file(char *path, char* filename, bool new) {
 
             free(escapedPath);
 
-            char* sdrFilePath;
-            asprintf(&sdrFilePath, "%s/script.sh", sdr_path);
+            char* sdrFilePath = asprintf_hd("%s/script.sh", sdr_path);
             Log("Writing script to %s\n", sdrFilePath);
             FILE* scriptFile = fopen(full_path, "r");
             FILE* sdrFile = fopen(sdrFilePath, "w");
@@ -322,15 +317,12 @@ void index_file(char *path, char* filename, bool new) {
 
 void remove_file(const char* path, const char* filename, char* uuid) {
     Log("Removing file: %s/%s", path, filename);
-    char* filePath;
-    asprintf(&filePath, "%s/%s", path, filename);
+    char* filePath = asprintf_hd("%s/%s", path, filename);
 
-    char* sdrPath;
-    asprintf(&sdrPath, "%s.sdr", filePath);
+    char* sdrPath = asprintf_hd("%s.sdr", filePath);
     free(filePath);
 
-    char* sdrScriptPath;
-    asprintf(&sdrScriptPath, "%s/script.sh", sdrPath);
+    char* sdrScriptPath = asprintf_hd("%s/script.sh", sdrPath);
 
     Log("Loading file");
     FILE* file = fopen(sdrScriptPath, "r");

launcher/main.c

@@ -19,8 +19,7 @@ void Log(const char* format, ...)
     va_start (args, format);
     va_list args2;
     va_copy (args2, args);
-    char* buffer;
-    vasprintf(&buffer, format, args2);
+    char* buffer = asprintf_hd(format, args2);
     printf("%s\n", buffer);
     syslog(LOG_INFO, "%s", buffer);
     free(buffer);
@@ -37,11 +36,9 @@ LIPCcode stub(LIPC *lipc, const char *property, void *value, void*) {
            (char *)value);
     char* mutValue = strdup(value);
     char *id = strtok((char *)mutValue, ":");
-    char *response;
-    asprintf(&response, "%s:0:", id);
+    char *response = asprintf_hd("%s:0:", id);
     Log("Replying with %s", response);
-    char *target;
-    asprintf(&target, "%sresult", property);
+    char *target = asprintf_hd("%sresult", property);
     Log("Replying with %s, %s", target, response);
     LipcSetStringProperty(lipc, "com.lab126.appmgrd", target, response);
     free(response);
@@ -60,8 +57,7 @@ LIPCcode unload_callback(LIPC* lipc, const char* property, void* value, void* da
 
     // Kill the app if it's running
     if (app_pid > 0) {
-        char* command;
-        asprintf(&command, "/var/local/mkk/su -c \"kill -9 %i\"", app_pid);
+        char* command = asprintf_hd("/var/local/mkk/su -c \"kill -9 %i\"", app_pid);
         Log("Killing with: %s", command);
         system(command);
         free(command);

utils/utils.c

@@ -74,8 +74,7 @@ void strip(char** string)
 
 char* buildCommand(const char* command, const char* sub)
 {
-    char* builtCommand;
-    asprintf(&builtCommand, command, sub);
+    char* builtCommand = asprintf_hd(command, sub);
     return builtCommand;
 }
 
@@ -89,8 +88,7 @@ void recursiveDelete(char* path)
         {
             continue;
         }
-        char* itemPath;
-        asprintf(&itemPath, "%s/%s", path, item->d_name);
+        char* itemPath = asprintf_hd("%s/%s", path, item->d_name);
         if (item->d_type == DT_DIR)
         {
             recursiveDelete(itemPath);