Fix hooks causing OOM

Author: ThatHackerDudeFromCyberspace

extractor/main.c

@@ -190,7 +190,7 @@ void index_file(char *path, char* filename, bool new) {
 
             char currentByte = 0;
             int processedBits = 0;
-            for (int i=(b64Pointer - header.icon); i < strlen(header.icon); i++) {
+            for (size_t i=(b64Pointer - header.icon); i < strlen(header.icon); i++) {
                 // Convert the base64 character to binary
                 char value = 0;
                 if (header.icon[i] >= 'A' && header.icon[i] <= 'Z') {
@@ -240,7 +240,7 @@ void index_file(char *path, char* filename, bool new) {
             // If the file is functional, run install hook
             char* escapedPath = malloc(strlen(full_path)*2 + 1);
             int escapedPathLength = 0;
-            for (int i=0; i < strlen(full_path); i++) {
+            for (size_t i=0; i < strlen(full_path); i++) {
                 if (full_path[i] == '"') {
                     escapedPath[escapedPathLength++] = '\\';
                 }
@@ -269,9 +269,9 @@ void index_file(char *path, char* filename, bool new) {
             Log("Writing script to %s\n", sdrFilePath);
             FILE* scriptFile = fopen(full_path, "r");
             FILE* sdrFile = fopen(sdrFilePath, "w");
-            char c;
-            while ((c = getc(scriptFile)) != EOF) {
-                putc(c, sdrFile);
+            int c;
+            while ((c = fgetc(scriptFile)) != EOF) {
+                fputc(c, sdrFile);
             }
             Log("Done!");
             fclose(scriptFile);
@@ -333,7 +333,7 @@ void remove_file(const char* path, const char* filename, char* uuid) {
             Log("Script uses hooks!");
             char* escapedPath = malloc(strlen(sdrScriptPath)*2 + 1);
             int escapedPathLength = 0;
-            for (int i=0; i < strlen(sdrScriptPath); i++) {
+            for (size_t i=0; i < strlen(sdrScriptPath); i++) {
                 if (sdrScriptPath[i] == '"') {
                     escapedPath[escapedPathLength++] = '\\';
                 }

launcher/main.c

@@ -15,14 +15,14 @@
 pid_t app_pid = -1;
 bool shouldExit = false;
 
-LIPCcode stub(LIPC *lipc, const char *property, void *value, void *data) {
+LIPCcode stub(LIPC *lipc, const char *property, void *value, void*) {
     syslog(LOG_INFO, "Stub called for \"%s\" with value \"%s\"", property,
            (char *)value);
     char *id = strtok((char *)value, ":");
-    char *response = malloc(strlen(id) + 3 + 1);
+    char *response = (char*) malloc(strlen(id) + 3 + 1);
     snprintf(response, strlen(id) + 3 + 1, "%s:0:", id);
     syslog(LOG_INFO, "Replying with %s", response);
-    char *target = malloc(strlen(property) + 6 + 1);
+    char *target = (char*) malloc(strlen(property) + 6 + 1);
     snprintf(target, strlen(property) + 6 + 1, "%sresult", property);
     syslog(LOG_INFO, "Replying with %s, %s", target, response);
     LipcSetStringProperty(lipc, "com.lab126.appmgrd", target, response);
@@ -64,9 +64,9 @@ char* getScriptCommand(char* scriptPath)
     readScriptHeader(file, &header);
     fclose(file);
 
-    char* escapedPath = malloc((strlen(scriptPath) * 2) + 1);
+    char* escapedPath = (char*) malloc((strlen(scriptPath) * 2) + 1);
     int escapedPathLength = 0;
-    for (int i=0; i < strlen(scriptPath); i++) {
+    for (size_t i=0; i < strlen(scriptPath); i++) {
         if (scriptPath[i] == '"') {
             escapedPath[escapedPathLength++] = '\\';
         }
@@ -93,7 +93,7 @@ char* getScriptCommand(char* scriptPath)
 }
 
 LIPCcode go_callback(LIPC* lipc, const char* property, void* value, void* data) {
-    char* rawFilePath = strchr(value, ':') + 6 + strlen(SERVICE_NAME) + 1;
+    char* rawFilePath = strchr((const char*)value, ':') + 6 + strlen(SERVICE_NAME) + 1;
     char* query = strchr(rawFilePath, '?');
     if (query != NULL) {
         query[0] = 0;

meson.build

@@ -1,4 +1,4 @@
-project('sh_integration', 'c', version : '1.0.0', default_options: ['cpp_std=c++17'])
+project('sh_integration', 'c', version : '1.0.0', default_options: ['warning_level=everything'])
 
 # Fetch our dependencies
 subproject('cjson', default_options: ['default_library=static']).get_variable('libcjson_dep')

utils/utils.c

@@ -1,10 +1,11 @@
 #include "utils.h"
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 
 char* urlDecode(char* raw)
 {
-    char* result = malloc(strlen(raw) + 1); // URLEncoded string will NEVER be longer decoded
+    char* result = (char*) malloc(strlen(raw) + 1); // URLEncoded string will NEVER be longer decoded
     int currentFilepathLen = 0;
 
     for (size_t i=0; i < strlen(raw); i++) {
@@ -19,6 +20,13 @@ char* urlDecode(char* raw)
     return result;
 }
 
+char* buildCommand(const char* command, const char* sub)
+{
+    char* builtCommand = (char*) malloc(strlen(command) + strlen(sub) + 1);
+    sprintf(builtCommand, command, sub);
+    return builtCommand;
+}
+
 void recursiveDelete(char* path)
 {
     DIR* dir = opendir(path);
@@ -29,7 +37,7 @@ void recursiveDelete(char* path)
         {
             continue;
         }
-        char* itemPath = malloc(strlen(path) + 1 + strlen(item->d_name) + 1);
+        char* itemPath = (char*) malloc(strlen(path) + 1 + strlen(item->d_name) + 1);
         sprintf(itemPath, "%s/%s", path, item->d_name);
         if (item->d_type == DT_DIR)
         {
@@ -42,13 +50,6 @@ void recursiveDelete(char* path)
     closedir(dir);
 }
 
-char* buildCommand(char* command, char* sub)
-{
-    char* builtCommand = malloc(strlen(command) + strlen(sub) + 1);
-    sprintf(builtCommand, command, sub);
-    return builtCommand;
-}
-
 void freeScriptHeader(struct ScriptHeader* header)
 {
     free(header->name);
@@ -58,7 +59,7 @@ void freeScriptHeader(struct ScriptHeader* header)
     header->name = NULL;
     header->author = NULL;
     header->icon = NULL;
-};
+}
 
 void readScriptHeader(FILE* file, struct ScriptHeader* header)
 {
@@ -68,12 +69,12 @@ void readScriptHeader(FILE* file, struct ScriptHeader* header)
     header->useFBInk=true;
     header->useHooks=false;
 
-    int bufferSize = 1024;
-    char* buffer = malloc(bufferSize);
+    size_t bufferSize = 1024;
+    char* buffer = (char*) malloc(bufferSize);
     fseek(file, 0, SEEK_SET);
     for (int i=0; i < 6; i++) {
         buffer[0] = '\0';
-        int lineLength = 0;
+        size_t lineLength = 0;
         int c;
         while ((c = fgetc(file)) != EOF)
         {
@@ -84,15 +85,15 @@ void readScriptHeader(FILE* file, struct ScriptHeader* header)
 
             if (lineLength + 2 >= bufferSize)
             {
-                buffer = realloc(buffer, bufferSize+=(lineLength + 2));
+                buffer = (char*) realloc(buffer, bufferSize+=(lineLength + 2));
                 if (buffer == NULL)
                 {
                     printf("FATAL - FAILED TO REALLOC BUFFER!!!\n");
                     return; //@TODO: We don't really have a good way of dealing with this
                 }
             }
 
-            buffer[lineLength++] = c;
+            buffer[lineLength++] = (char) c;
         }
         buffer[lineLength] = '\0';
 
@@ -124,4 +125,4 @@ void readScriptHeader(FILE* file, struct ScriptHeader* header)
         }
     }
     free(buffer);
-};
+}

utils/utils.h

@@ -4,12 +4,14 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <stdlib.h>
+#include <string.h>
 
 char* urlDecode(char* raw);
 
 void recursiveDelete(char* path);
 
-char* buildCommand(char* command, char* sub);
+char* buildCommand(const char* command, const char* sub);
 
 struct ScriptHeader
 {