1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From: =?utf-8?b?0L3QsNCx?= <nabijaczleweli@nabijaczleweli.xyz>
Date: Thu, 14 Nov 2024 01:05:38 +0100
Subject: Fix segfault if no argument given for -a or -m
---
src/concalc.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/concalc.cpp b/src/concalc.cpp
index 1abf073..a31cf7e 100644
--- a/src/concalc.cpp
+++ b/src/concalc.cpp
@@ -152,7 +152,7 @@ int main(int argc,char**argv)
{
if(strcmp(argv[c],"-a")==0 || strcmp(argv[c],"--angle")==0)
{
- if(argc>c)
+ if(argc>c+1)
{
if(strncmp(argv[c+1],"deg",3)==0)
pref->angle=DEG;
@@ -173,7 +173,7 @@ int main(int argc,char**argv)
}
else if(strcmp(argv[c],"-m")==0 || strcmp(argv[c],"--mode")==0)
{
- if(argc>c)
+ if(argc>c+1)
{
if(strncmp(argv[c+1],"base",3)==0)
pref->calcType=BASE;
@@ -197,7 +197,7 @@ int main(int argc,char**argv)
}
else if(strcmp(argv[c],"-b")==0 || strcmp(argv[c],"--base")==0)
{
- if(argc>c)
+ if(argc>c+1)
{
if(strncmp(argv[c+1],"bin",3)==0)
pref->base=BIN;
@@ -220,7 +220,7 @@ int main(int argc,char**argv)
}
else if(strcmp(argv[c],"-o")==0 || strcmp(argv[c],"--output")==0)
{
- if(argc>c)
+ if(argc>c+1)
{
int outLen=atoi(argv[c+1]);
if(outLen<2 || outLen>pref->precision)
|
