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
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
|
--- a/src/libdisplay/DisplayBase.cpp
+++ b/src/libdisplay/DisplayBase.cpp
@@ -224,7 +224,7 @@ DisplayBase::drawLabel(PlanetProperties
tzSave = "TZ=";
tzSave += tzEnv;
}
- putenv("TZ=UTC");
+ putenv((char *)"TZ=UTC");
tzset();
}
--- a/src/libdisplay/DisplayX11.cpp
+++ b/src/libdisplay/DisplayX11.cpp
@@ -97,8 +97,8 @@ DisplayX11::DisplayX11(const int tr) : D
// contributed by Dragan Stanojevic - Nevidljivi <invisible@hidden-city.net>
XClassHint classHint;
- classHint.res_name = "xplanet";
- classHint.res_class = "XPlanet";
+ classHint.res_name = (char *)"xplanet";
+ classHint.res_class = (char *)"XPlanet";
XSetClassHint(display, window, &classHint);
}
--- a/src/libimage/ReadImage.cpp
+++ b/src/libimage/ReadImage.cpp
@@ -45,6 +45,7 @@ ReadImage(const char *filename, int &wid
{
char buf[4];
unsigned char *ubuf = (unsigned char *) buf;
+ size_t ret = 0;
int success = 0;
FILE *file;
@@ -53,8 +54,10 @@ ReadImage(const char *filename, int &wid
/* see what kind of file we have */
- fread(buf, 1, 4, file);
+ ret = fread(buf, 1, 4, file);
fclose(file);
+ if (ret != 4)
+ return 0;
if (!strncmp("BM", buf, 2))
{
--- a/src/libmultiple/RayleighScattering.cpp
+++ b/src/libmultiple/RayleighScattering.cpp
@@ -630,19 +630,28 @@ RayleighScattering::readBinaryTable(cons
if (inFile != NULL)
{
- size_t dim0, dim1, dim2;
- fread(&dim0, sizeof(size_t), 1, inFile);
- fread(&dim1, sizeof(size_t), 1, inFile);
- fread(&dim2, sizeof(size_t), 1, inFile);
+ size_t dim0, dim1, dim2, ret;
+ ret = fread(&dim0, sizeof(size_t), 1, inFile);
+ if (ret == sizeof(size_t))
+ ret = fread(&dim1, sizeof(size_t), 1, inFile);
+ if (ret == sizeof(size_t))
+ ret = fread(&dim2, sizeof(size_t), 1, inFile);
- size_t size = dim0*dim1*dim2;
+ if (ret == sizeof(size_t))
+ {
+ size_t size = dim0*dim1*dim2;
- dblArray = new double[size];
- fread(dblArray, sizeof(double), size, inFile);
+ dblArray = new double[size];
+ ret = fread(dblArray, sizeof(double), size, inFile);
+ if (ret != size)
+ {
+ delete dblArray;
+ dblArray = NULL;
+ }
+ }
+ fclose(inFile);
}
- fclose(inFile);
-
return dblArray;
}
--- a/src/readConfig.cpp
+++ b/src/readConfig.cpp
@@ -49,7 +49,7 @@ readConfig(const char *line, PlanetPrope
int r, g, b;
if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
{
- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
+ unsigned char color[3] = { (unsigned char)(r & 0xff), (unsigned char)(g & 0xff), (unsigned char)(b & 0xff) };
currentProperties->ArcColor(color);
}
else
@@ -179,7 +179,7 @@ readConfig(const char *line, PlanetPrope
int r, g, b;
if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
{
- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
+ unsigned char color[3] = { (unsigned char)(r & 0xff), (unsigned char)(g & 0xff), (unsigned char)(b & 0xff) };
currentProperties->Color(color);
}
else
@@ -244,7 +244,7 @@ readConfig(const char *line, PlanetPrope
int r, g, b;
if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
{
- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
+ unsigned char color[3] = { (unsigned char)(r & 0xff), (unsigned char)(g & 0xff), (unsigned char)(b & 0xff) };
currentProperties->GridColor(color);
}
else
@@ -296,7 +296,7 @@ readConfig(const char *line, PlanetPrope
int r, g, b;
if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
{
- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
+ unsigned char color[3] = { (unsigned char)(r & 0xff), (unsigned char)(g & 0xff), (unsigned char)(b & 0xff) };
currentProperties->MarkerColor(color);
}
else
@@ -403,7 +403,7 @@ readConfig(const char *line, PlanetPrope
int r, g, b;
if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
{
- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
+ unsigned char color[3] = { (unsigned char)(r & 0xff), (unsigned char)(g & 0xff), (unsigned char)(b & 0xff) };
currentProperties->OrbitColor(color);
}
else
@@ -473,7 +473,7 @@ readConfig(const char *line, PlanetPrope
int r, g, b;
if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
{
- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
+ unsigned char color[3] = { (unsigned char)(r & 0xff), (unsigned char)(g & 0xff), (unsigned char)(b & 0xff) };
currentProperties->TextColor(color);
}
else
|
