Initializing all member variables.

dclamage · dclamage · commit 519c8c6bae9d · 2020-07-14T02:26:41.000-07:00
- These were found through Visual Studio static analysis
diff --git a/engine/common/console.h b/engine/common/console.h
@@ -40,16 +40,16 @@ enum conVarFlags_e {
 // Cvar
 class conVar_c {
 public:
-	char*	name;		// Cvar name
-	int		flags;		// Flags
-	bool	mod;		// Modified?
+	char*	name = nullptr;		// Cvar name
+	int		flags = 0;			// Flags
+	bool	mod = false;		// Modified?
 
-	int		intVal;		// Integer value
-	float	floatVal;	// Float value
-	char*	strVal;		// String value
+	int		intVal = 0;			// Integer value
+	float	floatVal = 0.f;		// Float value
+	char*	strVal = nullptr;	// String value
 
-	char*	defVal;		// Default string
-	int		min, max;	// Clamp limits
+	char*	defVal = nullptr;	// Default string
+	int		min = 0, max = 0;	// Clamp limits
 
 	conVar_c(IConsole* conHnd);
 	~conVar_c();
diff --git a/engine/core/core_config.cpp b/engine/core/core_config.cpp
@@ -193,7 +193,7 @@ bool core_config_c::LoadConfig(const char* cfgName)
 		}
 	}
 
-	delete cfg;
+	delete[] cfg;
 	return false;
 }
 
diff --git a/engine/core/core_image.cpp b/engine/core/core_image.cpp
@@ -313,7 +313,7 @@ bool targa_c::Save(char* fileName)
 			}
 			line.MemOutput(&out);
 		}
-		delete packet;
+		delete[] packet;
 	} else {
 		// Raw
 		for (int y = height - 1; y >= 0; y--) {
@@ -382,8 +382,8 @@ struct jpegError_s: public jpeg_error_mgr {
 // JPEG Reading
 
 struct jpegRead_s: public jpeg_source_mgr {
-	ioStream_c* in;
-	byte buffer[1024];
+	ioStream_c* in = nullptr;
+	byte buffer[1024] = {};
 	jpegRead_s(ioStream_c* in)
 		: in(in)
 	{
@@ -486,7 +486,7 @@ bool jpeg_c::Load(char* fileName)
 	} 
 	catch (...) {
 	}
-	delete rows;
+	delete[] rows;
 
 	jpeg_destroy_decompress(&jdecomp);
 	return false;
@@ -495,8 +495,8 @@ bool jpeg_c::Load(char* fileName)
 // JPEG Writing
 
 struct jpegWrite_s: public jpeg_destination_mgr {
-	ioStream_c* out;
-	byte buffer[1024];
+	ioStream_c* out = nullptr;
+	byte buffer[1024] = {};
 	jpegWrite_s(ioStream_c* out)
 		: out(out)
 	{
@@ -580,7 +580,7 @@ bool jpeg_c::Save(char* fileName)
 	catch (...) {
 		dst.Term(&jcomp);
 	}
-	delete rows;
+	delete[] rows;
 
 	jpeg_destroy_compress(&jcomp);
 	return false;
@@ -907,7 +907,7 @@ bool png_c::Save(char* fileName)
 	}
 	png_set_rows(png, pnginfo, rows);
 	png_write_png(png, pnginfo, PNG_TRANSFORM_IDENTITY, NULL);
-	delete rows;
+	delete[] rows;
 
 	png_destroy_write_struct(&png, &pnginfo);
 	return false;
@@ -1113,7 +1113,7 @@ bool blp_c::Load(char* fileName)
 
 	// Read image
 	int isize = 0;
-	int numMip;
+	int numMip = 0;
 	for (int c = 0; c < 16; c++) {
 		if (mip.size[c] == 0) {
 			numMip = c;
diff --git a/engine/core/core_image.h b/engine/core/core_image.h
@@ -33,11 +33,11 @@ struct imageInfo_s {
 // Image
 class image_c {
 public:
-	byte*	dat;
-	dword	width;
-	dword	height;
-	int		comp;
-	int		type;
+	byte*	dat = nullptr;
+	dword	width = 0;
+	dword	height = 0;
+	int		comp = 0;
+	int		type = 0;
 
 	image_c(IConsole* conHnd = NULL);
 	~image_c();
diff --git a/engine/core/core_main.cpp b/engine/core/core_main.cpp
@@ -30,13 +30,13 @@ class core_main_c: public core_IMain {
 	// Encapsulated
 	core_main_c(sys_IMain* sysHnd);
 
-	sys_IMain*		sys;
+	sys_IMain*		sys = nullptr;
 
-	core_IConfig*	config;
-	core_IVideo*	video;
-	ui_IMain*		ui;
+	core_IConfig*	config = nullptr;
+	core_IVideo*	video = nullptr;
+	ui_IMain*		ui = nullptr;
 
-	bool			initialised;
+	bool			initialised = false;
 };
 
 core_IMain* core_IMain::GetHandle(sys_IMain* sysHnd)
diff --git a/engine/render/r_font.h b/engine/render/r_font.h
@@ -25,9 +25,9 @@ class r_font_c {
 	const char*	StringCursorInternal(struct f_fontHeight_s* fh, const char* str, int curX);
 	void	DrawTextLine(scp_t pos, int align, int height, col4_t col, const char* str);
 
-	class r_renderer_c* renderer;
-	int		numFontHeight;
-	struct f_fontHeight_s* fontHeights[32];
-	int		maxHeight;
-	int*	fontHeightMap;
+	class r_renderer_c* renderer = nullptr;
+	int		numFontHeight = 0;
+	struct f_fontHeight_s *fontHeights[32] = {};
+	int		maxHeight = 0;
+	int*	fontHeightMap = nullptr;
 };
diff --git a/engine/render/r_main.cpp b/engine/render/r_main.cpp
@@ -424,7 +424,7 @@ void r_renderer_c::EndFrame()
 	for (int l = 0; l < numLayer; l++) {
 		layerSort[l]->Render();
 	}
-	delete layerSort;
+	delete[] layerSort;
 
 	glFlush();
 
@@ -744,7 +744,7 @@ void r_renderer_c::DoScreenshot(image_c* i, char* ext)
 	for (int y = 0; y < ys; y++, p1+= span, p2-= span) {
 		memcpy(p2, p1, span);
 	}
-	delete sbuf;
+	delete[] sbuf;
 
 	// Set image info
 	i->dat = ss;
diff --git a/engine/render/r_main.h b/engine/render/r_main.h
@@ -80,47 +80,47 @@ class r_renderer_c: public r_IRenderer, public conCmdHandler_c {
 	// Encapsulated
 	r_renderer_c(sys_IMain* sysHnd);
 
-	sys_IMain* sys;
+	sys_IMain* sys = nullptr;
 
-	sys_IOpenGL* openGL;
+	sys_IOpenGL* openGL = nullptr;
 
-	r_ITexManager* texMan;	// Texture manager interface
+	r_ITexManager* texMan = nullptr;	// Texture manager interface
 
-	const char*	st_vendor;	// Vendor string
-	const char*	st_renderer;// Renderer string
-	const char*	st_ver;		// Version string
-	const char*	st_ext;		// Exntension string
+	const char*	st_vendor = nullptr;	// Vendor string
+	const char*	st_renderer = nullptr;	// Renderer string
+	const char*	st_ver = nullptr;		// Version string
+	const char*	st_ext = nullptr;		// Exntension string
 
-	bool	texNonPOT;		// Non power-of-2 textures supported?
-	dword	texMaxDim;		// Maximum texture dimension
+	bool	texNonPOT = false;			// Non power-of-2 textures supported?
+	dword	texMaxDim = 0;				// Maximum texture dimension
 
-	PFNGLCOMPRESSEDTEXIMAGE2DARBPROC	glCompressedTexImage2DARB;
+	PFNGLCOMPRESSEDTEXIMAGE2DARBPROC	glCompressedTexImage2DARB = nullptr;
 	
-	conVar_c*	r_compress;
-	conVar_c*	r_screenshotFormat;
-	conVar_c*	r_layerDebug;
+	conVar_c*	r_compress = nullptr;
+	conVar_c*	r_screenshotFormat = nullptr;
+	conVar_c*	r_layerDebug = nullptr;
 
-	r_shaderHnd_c* whiteImage;	// White image
+	r_shaderHnd_c* whiteImage = nullptr;	// White image
 
-	r_font_c* fonts[F_NUMFONTS]; // Font objects
+	r_font_c* fonts[F_NUMFONTS] = {}; // Font objects
 
-	col4_t	drawColor;		// Current draw color
+	col4_t	drawColor = {};		// Current draw color
 
 	r_viewport_s curViewport; // Current viewport
 
-	int		numShader;
-	class r_shader_c* shaderList[R_MAXSHADERS];
+	int		numShader = 0;
+	class r_shader_c *shaderList[R_MAXSHADERS] = {};
 
-	int		numLayer;
-	int		layerListSize;
-	r_layer_c** layerList;
-	r_layer_c* curLayer;
+	int		numLayer = 0;
+	int		layerListSize = 0;
+	r_layer_c** layerList = nullptr;
+	r_layer_c* curLayer = nullptr;
 
-	int		layerCmdBinCount;
-	int		layerCmdBinSize;
-	struct r_layerCmd_s** layerCmdBin;
+	int		layerCmdBinCount = 0;
+	int		layerCmdBinSize = 0;
+	struct r_layerCmd_s** layerCmdBin = nullptr;
 
-	int		takeScreenshot;
+	int		takeScreenshot = 0;
 	void	DoScreenshot(image_c* i, char* ext);
 
 	void	C_Screenshot(IConsole* conHnd, args_c &args);
diff --git a/engine/render/r_texture.cpp b/engine/render/r_texture.cpp
@@ -209,9 +209,9 @@ void t_manager_c::ThreadProc()
 
 class t_sampleDim_c {
 public:
-	int		max;
-	int		i1, i2;
-	double	w1, w2;
+	int		max = 0;
+	int		i1 = 0, i2 = 0;
+	double	w1 = 0.0, w2 = 0.0;
 
 	t_sampleDim_c(int imax)
 	{
diff --git a/engine/system/sys_main.h b/engine/system/sys_main.h
@@ -35,12 +35,12 @@ class thread_c {
 // File finder
 class find_c {
 public:
-	char	fileName[512];
-	bool	isDirectory;
-	dword	fileSize;
-	unsigned long long modified;
-	char	modifiedDate[256];
-	char	modifiedTime[256];
+	char	fileName[512] = {};
+	bool	isDirectory = false;
+	dword	fileSize = 0;
+	unsigned long long modified = 0;
+	char	modifiedDate[256] = {};
+	char	modifiedTime[256] = {};
 
 	find_c();
 	~find_c();
@@ -57,16 +57,16 @@ class find_c {
 // System Main
 class sys_IMain {
 public:
-	IConsole* con;
-	sys_IConsole* conWin;
-	sys_IVideo* video;
+	IConsole* con = nullptr;
+	sys_IConsole* conWin = nullptr;
+	sys_IVideo* video = nullptr;
 
-	bool	x64;
-	bool	debug;
-	bool	debuggerRunning;
-	int		processorCount;
-	char	basePath[512];
-	char	userPath[512];
+	bool	x64 = false;
+	bool	debug = false;
+	bool	debuggerRunning = false;
+	int		processorCount = 0;
+	char	basePath[512] = {};
+	char	userPath[512] = {};
 
 	virtual int		GetTime() = 0;
 	virtual void	Sleep(int msec) = 0;
diff --git a/engine/system/sys_video.h b/engine/system/sys_video.h
@@ -19,19 +19,19 @@ enum vidFlags_e {
 
 // Saved video state structure
 struct sys_vidSave_s {
-	int		size[2];
-	int		pos[2];
-	bool	maximised;
+	int		size[2] = {};
+	int		pos[2] = {};
+	bool	maximised = false;
 };
 
 // Video settings structure
 struct sys_vidSet_s {
-	bool	shown;		// Show window?
-	int		flags;		// Flags
-	int		display;	// Display number
-	int		mode[2];	// Resolution or window size
-	int		depth;		// Bit depth
-	int		minSize[2];	// Minimum size for resizable windows
+	bool	shown = false;		// Show window?
+	int		flags = 0;		// Flags
+	int		display = 0;	// Display number
+	int		mode[2] = {};	// Resolution or window size
+	int		depth = 0;		// Bit depth
+	int		minSize[2] = {};	// Minimum size for resizable windows
 	sys_vidSave_s save; // Saved state
 };
 
diff --git a/engine/system/win/sys_console.cpp b/engine/system/win/sys_console.cpp
@@ -31,13 +31,13 @@ class sys_console_c: public sys_IConsole, public conPrintHook_c, public thread_c
 	sys_console_c(sys_IMain* sysHnd);
 	~sys_console_c();
 
-	sys_main_c* sys;
+	sys_main_c* sys = nullptr;
 
-	bool	shown;		// Is currently shown?
-	HWND	hwMain;		// Main window
-	HWND	hwOut;		// Output
-	HFONT	font;		// Font handle
-	HBRUSH	bBackground;// Background brush
+	bool	shown = false;			// Is currently shown?
+	HWND	hwMain = nullptr;		// Main window
+	HWND	hwOut = nullptr;		// Output
+	HFONT	font = nullptr;			// Font handle
+	HBRUSH	bBackground = nullptr;	// Background brush
 
 	static LRESULT __stdcall WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
diff --git a/engine/system/win/sys_local.h b/engine/system/win/sys_local.h
@@ -50,16 +50,16 @@ class sys_main_c: public sys_IMain {
 	int		KeyToVirtual(byte key);
 	byte	VirtualToKey(int virt);
 
-	HINSTANCE hinst;
-	HICON	icon;
+	HINSTANCE hinst = nullptr;
+	HICON	icon = nullptr;
 
-	class core_IMain* core;
+	class core_IMain* core = nullptr;
 
-	bool	initialised;
-	volatile bool	exitFlag;
-	volatile bool	restartFlag;
-	char*	exitMsg;
-	char*	threadError;
-	bool	errorRaised;
-	int		baseTime;
+	bool	initialised = false;
+	volatile bool	exitFlag = false;
+	volatile bool	restartFlag = false;
+	char*	exitMsg = nullptr;
+	char*	threadError = nullptr;
+	bool	errorRaised = nullptr;
+	int		baseTime = 0;
 };
diff --git a/engine/system/win/sys_opengl.cpp b/engine/system/win/sys_opengl.cpp
@@ -32,13 +32,13 @@ class sys_openGL_c: public sys_IOpenGL {
 
 	sys_main_c* sys;
 
-	PFNWGLGETEXTENSIONSTRINGEXTPROC wglGetExtensionsStringEXT;
-	PFNWGLSWAPINTERVALEXTPROC		wglSwapIntervalEXT;
+	PFNWGLGETEXTENSIONSTRINGEXTPROC wglGetExtensionsStringEXT = nullptr;
+	PFNWGLSWAPINTERVALEXTPROC		wglSwapIntervalEXT = nullptr;
 
-	HDC		hdc;				// Device contexts
-	HDC		hdc2;
-	HGLRC	hglrc;				// Rendering contexts
-	HGLRC	hglrc2;
+	HDC		hdc = nullptr;				// Device contexts
+	HDC		hdc2 = nullptr;
+	HGLRC	hglrc = nullptr;			// Rendering contexts
+	HGLRC	hglrc2 = nullptr;
 };
 
 sys_IOpenGL* sys_IOpenGL::GetHandle(sys_IMain* sysHnd)
diff --git a/engine/system/win/sys_video.cpp b/engine/system/win/sys_video.cpp
diff --git a/ui_console.cpp b/ui_console.cpp
diff --git a/ui_debug.cpp b/ui_debug.cpp
diff --git a/ui_main.h b/ui_main.h
diff --git a/ui_subscript.cpp b/ui_subscript.cpp

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ bool core_config_c::LoadConfig(const char* cfgName)`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`
`196`		`- delete cfg;`
	`196`	`+ delete[] cfg;`
`197`	`197`	`return false;`
`198`	`198`	`}`
`199`	`199`
Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ void r_renderer_c::EndFrame()`
`424`	`424`	`for (int l = 0; l < numLayer; l++) {`
`425`	`425`	`layerSort[l]->Render();`
`426`	`426`	`}`
`427`		`- delete layerSort;`
	`427`	`+ delete[] layerSort;`
`428`	`428`
`429`	`429`	`glFlush();`
`430`	`430`
`@@ -744,7 +744,7 @@ void r_renderer_c::DoScreenshot(image_c* i, char* ext)`
`744`	`744`	`for (int y = 0; y < ys; y++, p1+= span, p2-= span) {`
`745`	`745`	`memcpy(p2, p1, span);`
`746`	`746`	`}`
`747`		`- delete sbuf;`
	`747`	`+ delete[] sbuf;`
`748`	`748`
`749`	`749`	`// Set image info`
`750`	`750`	`i->dat = ss;`