Fix for Issue #64 Error parsing incomplete datablocks

CroatiaControlLtd · May 9, 2017 · 6ebff38 · 6ebff38
1 parent 04f700e
commit 6ebff38
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/.cproject b/.cproject
@@ -105,15 +105,6 @@
 			<resource resourceType="PROJECT" workspacePath="/asterix"/>
 		</configuration>
 	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cygwin.base.1179451372;cdt.managedbuild.toolchain.gnu.cygwin.base.1179451372.338720114;cdt.managedbuild.tool.gnu.c.compiler.cygwin.base.360528631;cdt.managedbuild.tool.gnu.c.compiler.input.cygwin.891266556">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cygwin.base.1179451372;cdt.managedbuild.toolchain.gnu.cygwin.base.1179451372.338720114;cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base.1160693207;cdt.managedbuild.tool.gnu.cpp.compiler.input.cygwin.1747435264">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"/>
-		</scannerConfigBuildInfo>
-	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
 		<buildTargets>
 			<target name="Release" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
@@ -126,4 +117,19 @@
 			</target>
 		</buildTargets>
 	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cygwin.base.1179451372.1330079484;cdt.managedbuild.toolchain.gnu.cygwin.base.1179451372.1330079484.;cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base.1764328002;cdt.managedbuild.tool.gnu.cpp.compiler.input.cygwin.1677398893">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cygwin.base.1179451372;cdt.managedbuild.toolchain.gnu.cygwin.base.1179451372.338720114;cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base.1160693207;cdt.managedbuild.tool.gnu.cpp.compiler.input.cygwin.1747435264">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cygwin.base.1179451372.1330079484;cdt.managedbuild.toolchain.gnu.cygwin.base.1179451372.1330079484.;cdt.managedbuild.tool.gnu.c.compiler.cygwin.base.1554202253;cdt.managedbuild.tool.gnu.c.compiler.input.cygwin.2042837624">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cygwin.base.1179451372;cdt.managedbuild.toolchain.gnu.cygwin.base.1179451372.338720114;cdt.managedbuild.tool.gnu.c.compiler.cygwin.base.360528631;cdt.managedbuild.tool.gnu.c.compiler.input.cygwin.891266556">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"/>
+		</scannerConfigBuildInfo>
+	</storageModule>
 </cproject>
diff --git a/src/asterix/asterixrawsubformat.cxx b/src/asterix/asterixrawsubformat.cxx
@@ -67,12 +67,6 @@ bool CAsterixRawSubformat::ReadPacket(CBaseFormatDescriptor &formatDescriptor, C
 
 		if (oradis)
 		{
-			if (leftBytes < 6)
-			{
-				LOGERROR(1, "Not enough data for packet. Size = %d\n", leftBytes);
-				return false;
-			}
-
 			// Read ORADIS header (6 bytes)
 			unsigned char oradisHeader[6];
 			readSize = 6;
@@ -113,12 +107,6 @@ bool CAsterixRawSubformat::ReadPacket(CBaseFormatDescriptor &formatDescriptor, C
 		}
 		else
 		{
-			if (leftBytes < 3)
-			{
-				LOGERROR(1, "Not enough data for packet. Size = %d\n", leftBytes);
-				return false;
-			}
-
 			// Read Asterix header (3 bytes)
 			unsigned char asterixHeader[3];
 			readSize = 3;