summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dimension/lexer.l2
-rw-r--r--dimension/main.c6
-rw-r--r--libdimension/bvst.c1
3 files changed, 7 insertions, 2 deletions
diff --git a/dimension/lexer.l b/dimension/lexer.l
index d198b62..5a603ea 100644
--- a/dimension/lexer.l
+++ b/dimension/lexer.l
@@ -107,7 +107,7 @@
CALCULATE_COLUMN(); \
} while(0)
-int token;
+int token = DMNSN_T_LEX_ERROR;
size_t string_length = 0, string_extent = 8;
unsigned long wchar;
diff --git a/dimension/main.c b/dimension/main.c
index 53b8288..a03762f 100644
--- a/dimension/main.c
+++ b/dimension/main.c
@@ -89,6 +89,8 @@ main(int argc, char **argv) {
case 'w':
{
+ dmnsn_assert(optarg, "NULL argument.");
+
char *endptr;
width = strtoul(optarg, &endptr, 10);
if (*endptr != '\0' || endptr == optarg) {
@@ -99,6 +101,8 @@ main(int argc, char **argv) {
}
case 'h':
{
+ dmnsn_assert(optarg, "NULL argument.");
+
char *endptr;
height = strtoul(optarg, &endptr, 10);
if (*endptr != '\0' || endptr == optarg) {
@@ -110,6 +114,8 @@ main(int argc, char **argv) {
case DMNSN_OPT_THREADS:
{
+ dmnsn_assert(optarg, "NULL argument.");
+
char *endptr;
nthreads = strtoul(optarg, &endptr, 10);
if (*endptr != '\0' || endptr == optarg) {
diff --git a/libdimension/bvst.c b/libdimension/bvst.c
index bfc8124..462d1f0 100644
--- a/libdimension/bvst.c
+++ b/libdimension/bvst.c
@@ -378,7 +378,6 @@ dmnsn_bvst_search_recursive(dmnsn_bvst_node *node, dmnsn_line ray, double t)
if (result_temp.node && (t < 0.0 || result_temp.intersection->t < t)) {
dmnsn_delete_intersection(result.intersection);
result = result_temp;
- t = result.intersection->t;
} else {
dmnsn_delete_intersection(result_temp.intersection);
}