summaryrefslogtreecommitdiff
path: root/task2.c
diff options
context:
space:
mode:
Diffstat (limited to 'task2.c')
-rw-r--r--task2.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/task2.c b/task2.c
index b675244..1847103 100644
--- a/task2.c
+++ b/task2.c
@@ -6,16 +6,17 @@ int main(int argc, char**argv)
if (argc != 3)
return 1;
-
- char *xor_string_tmp = malloc(strlen(argv[1]));
- char *result = malloc(strlen(argv[1]));
- char *str1 = malloc(strlen(argv[1]));
- char *str2 = malloc(strlen(argv[2]));
+ int length_arg_1 = strlen(argv[1]);
+ int length_arg_2 = strlen(argv[2]);
+ char *xor_string_tmp = malloc(length_arg_1+1);
+ char *result = malloc(length_arg_1*2+1);
+ char *str1 = malloc(length_arg_1+1);
+ char *str2 = malloc(length_arg_2+1);
decode_hex_string(argv[1], str1);
decode_hex_string(argv[2], str2);
- xor_string(str1, str2, xor_string_tmp, strlen(argv[2]), strlen(argv[1]));
- hex_binary_to_string(xor_string_tmp, result, strlen(argv[1]));
+ xor_string(str1, str2, xor_string_tmp, length_arg_2, length_arg_1);
+ hex_binary_to_string(xor_string_tmp, result, (length_arg_1/2));
printf("%s\n", result);
free(xor_string_tmp);