Merge pull request #38 from nwneetools/null-pointer

fix nullpointer issue for non-ignored includes and `-c` behavioral issues

Author: tinygiant98

_NscLib/NscCodeGenerator.cpp

@@ -256,10 +256,13 @@ bool CNscCodeGenerator::GenerateOutput (CNwnStream *pCodeOutput,
 	// Add our main
 	//
 
-	pSymbol ->ulFlags |= NscSymFlag_Referenced;
-	m_anFunctions .push_back (m_pCtx ->GetSymbolOffset (pSymbol));
-	GatherUsed (pSymbol);
-	
+	if (pSymbol)
+	{
+		pSymbol->ulFlags |= NscSymFlag_Referenced;
+		m_anFunctions.push_back(m_pCtx->GetSymbolOffset(pSymbol));
+		GatherUsed(pSymbol);
+	}
+
 	//
 	// Initialize the stack depths
 	//
@@ -598,9 +601,13 @@ bool CNscCodeGenerator::GenerateOutput (CNwnStream *pCodeOutput,
 		return false;
 
 	//
-	// Write the output
+	// Write the output.
+	// Return early if file is not executable.
 	//
 
+	if (pSymbol == NULL)
+		return true;
+
 	UINT32 ulSize = (UINT32) (m_pauchOut - m_pauchCode);
 	WriteINT32 (&m_pauchCode [9], ulSize);
 	pCodeOutput ->Write (m_pauchCode, m_pauchOut - m_pauchCode);

_NscLib/NscCompiler.cpp

@@ -419,8 +419,25 @@ NscResult NscCompileScript (CNwnLoader *pLoader, const char *pszName,
 
 	try
 	{
-		if (!sGen .GenerateOutput (pCodeOutput, pDebugOutput, fIgnoreIncludes))
+		if (sGen .GenerateOutput (pCodeOutput, pDebugOutput, fIgnoreIncludes))
+		{
+			//
+			// If using the -c flag, prevent creating a compiled file.
+			//
+
+			if (!fIgnoreIncludes && !sCtx .HasMain ())
+			{
+				if (fAllocated)
+					free (pauchData);
+				return NscResult_Include;
+			}
+		}
+		else
 			return NscResult_Failure;
+
+
+		//if (!sGen .GenerateOutput (pCodeOutput, pDebugOutput, fIgnoreIncludes))
+		//	return NscResult_Failure;
 	}
 	catch (std::exception)
 	{