From 3b82de92a0f3a1a810ae1521d2f72795f9d65157 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Fri, 8 Jan 2010 22:02:21 -0800
Subject: progs/demos: Add missing initializers in engine.c.
---
progs/demos/engine.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
(limited to 'progs/demos')
diff --git a/progs/demos/engine.c b/progs/demos/engine.c
index 3cf311e778..838d28c363 100644
--- a/progs/demos/engine.c
+++ b/progs/demos/engine.c
@@ -120,7 +120,11 @@ static Engine Engines[NUM_ENGINES] =
0.3, /* CrankJournalRadius */
0.4, /* CrankJournalLength */
1.5, /* ConnectingRodLength */
- 0.1 /* ConnectingRodThickness */
+ 0.1, /* ConnectingRodThickness */
+ 0, /* CrankList */
+ 0, /* ConnRodList */
+ 0, /* PistonList */
+ 0 /* BlockList */
},
{
"Inline-4",
@@ -136,7 +140,11 @@ static Engine Engines[NUM_ENGINES] =
0.3, /* CrankJournalRadius */
0.4, /* CrankJournalLength */
1.5, /* ConnectingRodLength */
- 0.1 /* ConnectingRodThickness */
+ 0.1, /* ConnectingRodThickness */
+ 0, /* CrankList */
+ 0, /* ConnRodList */
+ 0, /* PistonList */
+ 0 /* BlockList */
},
{
"Boxer-6",
@@ -152,7 +160,11 @@ static Engine Engines[NUM_ENGINES] =
0.3, /* CrankJournalRadius */
0.4, /* CrankJournalLength */
1.5, /* ConnectingRodLength */
- 0.1 /* ConnectingRodThickness */
+ 0.1, /* ConnectingRodThickness */
+ 0, /* CrankList */
+ 0, /* ConnRodList */
+ 0, /* PistonList */
+ 0 /* BlockList */
}
};
--
cgit v1.2.3
From 0c7814fe238fe0e2bbeff448c32f79146f9ae923 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Sun, 10 Jan 2010 00:40:46 -0800
Subject: progs/demos: Bounds check input to fire.c.
---
progs/demos/fire.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
(limited to 'progs/demos')
diff --git a/progs/demos/fire.c b/progs/demos/fire.c
index f30b893dbf..475582c81b 100644
--- a/progs/demos/fire.c
+++ b/progs/demos/fire.c
@@ -726,8 +726,13 @@ main(int ac, char **av)
maxage = 1.0 / dt;
- if (ac == 2)
+ if (ac == 2) {
np = atoi(av[1]);
+ if (np <= 0 || np > 1000000) {
+ fprintf(stderr, "Invalid input.\n");
+ exit(-1);
+ }
+ }
if (ac == 4) {
WIDTH = atoi(av[2]);
@@ -762,6 +767,7 @@ main(int ac, char **av)
assert(np > 0);
p = (part *) malloc(sizeof(part) * np);
+ assert(p);
for (i = 0; i < np; i++)
setnewpart(&p[i]);
--
cgit v1.2.3
From 6d6c9c668894c393f7b6086fe0a4234939656865 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Mon, 11 Jan 2010 00:24:39 -0800
Subject: progs/demos: Remove unnecessary header from fbotexture.c.
---
progs/demos/fbotexture.c | 1 -
1 file changed, 1 deletion(-)
(limited to 'progs/demos')
diff --git a/progs/demos/fbotexture.c b/progs/demos/fbotexture.c
index 56482663dc..46bf1c5f6a 100644
--- a/progs/demos/fbotexture.c
+++ b/progs/demos/fbotexture.c
@@ -14,7 +14,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <math.h>
#include "extfuncs.h"
/* For debug */
--
cgit v1.2.3
From d42467687e9de756aa3e4bca5e55f69391af3065 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Wed, 6 Jan 2010 21:39:44 -0800
Subject: progs/demos: Assert that input to malloc is valid.
---
progs/demos/fire.c | 2 ++
1 file changed, 2 insertions(+)
(limited to 'progs/demos')
diff --git a/progs/demos/fire.c b/progs/demos/fire.c
index dd70f6141d..f30b893dbf 100644
--- a/progs/demos/fire.c
+++ b/progs/demos/fire.c
@@ -6,6 +6,7 @@
* Humanware s.r.l.
*/
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
@@ -759,6 +760,7 @@ main(int ac, char **av)
glFogfv(GL_FOG_COLOR, fogcolor);
glFogf(GL_FOG_DENSITY, 0.1);
+ assert(np > 0);
p = (part *) malloc(sizeof(part) * np);
for (i = 0; i < np; i++)
--
cgit v1.2.3
From b4bc20852921f42f0499a174602e87bc3d4495f3 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Mon, 11 Jan 2010 19:03:18 -0800
Subject: progs/demos: Remove unnecessary header from isosurf.c.
---
progs/demos/isosurf.c | 1 -
1 file changed, 1 deletion(-)
(limited to 'progs/demos')
diff --git a/progs/demos/isosurf.c b/progs/demos/isosurf.c
index dd5696507b..d9e50a3c19 100644
--- a/progs/demos/isosurf.c
+++ b/progs/demos/isosurf.c
@@ -27,7 +27,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <string.h>
#include <math.h>
#ifdef _WIN32
#include <windows.h>
--
cgit v1.2.3
From 78ddce9fdada4b09a008b65d91e3e43cfe011459 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Mon, 11 Jan 2010 19:29:26 -0800
Subject: progs/demos: Remove unnecessary header from morph3d.c.
---
progs/demos/morph3d.c | 1 -
1 file changed, 1 deletion(-)
(limited to 'progs/demos')
diff --git a/progs/demos/morph3d.c b/progs/demos/morph3d.c
index 01a06aba0f..eab520a989 100644
--- a/progs/demos/morph3d.c
+++ b/progs/demos/morph3d.c
@@ -137,7 +137,6 @@ So the angle is:
#endif
#include <GL/glut.h>
#include <math.h>
-#include <string.h>
#define Scale 0.3
--
cgit v1.2.3