Marto/calculator
1
0
Fork 0
mirror of https://github.com/sloven-c/calculator.git synced 2025-10-30 12:27:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some of the footguns

Browse Source
This commit is contained in:
Martin Vrhovšek
2025-10-30 08:06:18 +01:00
parent d665218448
commit 385d614819
4 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
stack.c
View File

@@ -15,17 +15,17 @@ stack stack_init(const DataType type, const int len) {
.len = len,
};
const size_t arrLen = len * sizeof(char);
const size_t arrLen = len;
switch (type) {
case StringArray:
stack.data.sarr = malloc(arrLen);
stack.data.sarr = malloc(arrLen * sizeof(char *));
break;
case CharArray:
stack.data.carr = malloc(arrLen);
stack.data.carr = malloc(arrLen * sizeof(char));
break;
case IntArray:
stack.data.narr = malloc(arrLen);
stack.data.narr = malloc(arrLen * sizeof(int));
default:
fprintf(stderr, "Failed to recognise the DataType for Stack structure");
exit(1);
@@ -106,18 +106,21 @@ stackData stack_pop(stack *stack) {
}
stackData stack_get(const stack *stack, const int n) {
if (stack->i == -1 || n >= stack->len) return (stackData){.ret_code = 1};
if (stack->i == -1 || n > stack->i) return (stackData){.ret_code = 1};
stackInput returnData;
switch (stack->type) {
case StringArray:
returnData.string = stack->data.sarr[stack->i];
// todo do not forget to think about freeing memory
const size_t len = strlen(stack->data.sarr[n]);
returnData.string = malloc(len * sizeof(char) + 1);
strcpy(returnData.string, stack->data.sarr[n]);
break;
case CharArray:
returnData.ch = stack->data.carr[stack->i];
returnData.ch = stack->data.carr[n];
break;
case IntArray:
returnData.n = stack->data.narr[stack->i];
returnData.n = stack->data.narr[n];
break;
}
@@ -151,7 +154,7 @@ void stack_print(const stack *stack, const char *name) {
printf("\n");
}
printf("\n");
printf("i location: %d\n", stack->i);
}
static void clear_str_array(const stack *stack) {