Fixup urldecode and log issues

Author: ThatHackerDudeFromCyberspace

extractor/main.c

@@ -178,7 +178,7 @@ void index_file(char *path, char* filename, bool new) {
         sprintf(sdr_path, "%s.sdr", full_path);
         mkdir(sdr_path, 0755);
 
-        if (validIcon && strncmp(header.icon, "data:image", strlen("data:image"))) {
+        if (validIcon && strncmp(header.icon, "data:image", strlen("data:image")) == 0) {
             Log("Valid BASE64 icon detected, attempting to extract it");
             //data:image/jpeg;base64,iVBORw0KGgoAAAANSUhEUgAAA
             char* fileTypePointer = strchr(header.icon, '/')+1;

launcher/main.c

@@ -20,10 +20,10 @@ void Log(const char* format, ...)
     va_list args2;
     va_copy (args2, args);
     int size = vsnprintf (NULL, 0, format, args) + 1;
-    char* buffer = malloc((unsigned long) size);
+    char* buffer = (char*) malloc((unsigned long) size);
     vsnprintf (buffer, (unsigned long) size, format, args2);
     printf("%s\n", buffer);
-    syslog(LOG_INFO, buffer);
+    syslog(LOG_INFO, "%s", buffer);
     free(buffer);
     va_end (args);
     va_end (args2);
@@ -133,6 +133,7 @@ LIPCcode go_callback(LIPC* lipc, const char* property, void* value, void* data)
 
     // Parse the filePath as it is urlencoded
     char* filePath = urlDecode(rawFilePath);
+    Log("Decoded path: \"%s\"", filePath);
 
     char* command = getScriptCommand(filePath);
     if (command == NULL)

tests/launcher_test_edgecases.c

@@ -1,11 +1,36 @@
 #include "launcher.h"
+#include "utils.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 int main()
 {
+    assert(hexDecode('0') == 0);
+    assert(hexDecode('1') == 1);
+    assert(hexDecode('2') == 2);
+    assert(hexDecode('3') == 3);
+    assert(hexDecode('4') == 4);
+    assert(hexDecode('5') == 5);
+    assert(hexDecode('6') == 6);
+    assert(hexDecode('7') == 7);
+    assert(hexDecode('8') == 8);
+    assert(hexDecode('9') == 9);
+    assert(hexDecode('a') == 10);
+    assert(hexDecode('b') == 11);
+    assert(hexDecode('c') == 12);
+    assert(hexDecode('d') == 13);
+    assert(hexDecode('e') == 14);
+    assert(hexDecode('f') == 15);
+    assert(hexDecode('A') == 10);
+    assert(hexDecode('B') == 11);
+    assert(hexDecode('C') == 12);
+    assert(hexDecode('D') == 13);
+    assert(hexDecode('E') == 14);
+    assert(hexDecode('F') == 15);
+
+
     char* command = getScriptCommand("./tests/Check OTA status v1.1.sh");
     assert(command != NULL);
     printf("Check OTA status v1.1.sh - %s\n", command);
@@ -19,11 +44,13 @@ int main()
     free(command);
 
     printf("\n\n");
-    const char* test = "4:app://com.notmarek.shell_integration.launcher./tests/KindleCraft.sh";
+    char* test = strdup("4:app://com.notmarek.shell_integration.launcher./tests/KindleCraft.sh");
     go_callback(NULL, "test1", test, NULL);
     printf("\n\n");
+    free(test);
 
-    test = "4:app://com.notmarek.shell_integration.launcher./tests/Check OTA status v1.1.sh";
+    test = strdup("4:app://com.notmarek.shell_integration.launcher.%2Ftests%2FCheck%20OTA%20status%20v1.1.sh");
     go_callback(NULL, "test2", test, NULL);
+    free(test);
     return 0;
 }

utils/utils.c

@@ -4,14 +4,31 @@
 #include <stdlib.h>
 #include <string.h>
 
+int hexDecode(char c)
+{
+    if (c >= '0' && c <= '9')
+    {
+        return c - '0';
+    }
+    else if (c >= 'a' && c <= 'z')
+    {
+        return c - 'a' + 10;
+    }
+    else if (c >= 'A' && c <= 'Z')
+    {
+        return c - 'A' + 10;
+    }
+    return 0;
+}
+
 char* urlDecode(char* raw)
 {
     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++) {
         if (raw[i] == '%') {
-            result[currentFilepathLen++] = (char)(((raw[i+1] - '0') << 4) + (raw[i+2] - '0'));
+            result[currentFilepathLen++] = (char)((hexDecode(raw[i+1]) << 4) + hexDecode(raw[i+2]));
             i += 2;
         } else {
             result[currentFilepathLen++] = raw[i];
@@ -33,7 +50,7 @@ void strip(char** string)
     *string = finalString;
 }
 
-inline char* buildCommand(const char* command, const char* sub)
+char* buildCommand(const char* command, const char* sub)
 {
     char* builtCommand = (char*) malloc(strlen(command) + strlen(sub) + 1);
     sprintf(builtCommand, command, sub);

utils/utils.h

@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+int hexDecode(char c);
 char* urlDecode(char* raw);
 void strip(char** string);