Check that the superframe flag is set properly

Thealexbarney · Oct 17, 2018 · 6a9e00f · 6a9e00f
1 parent 0fb7069
commit 6a9e00f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/C/src/structures.h b/C/src/structures.h
@@ -130,6 +130,7 @@ struct Block {
 };
 
 struct Frame {
+	int IndexInSuperframe;
 	ConfigData* Config;
 	Channel* Channels[MAX_CHANNEL_COUNT];
 	Block Blocks[MAX_BLOCK_COUNT];

diff --git a/C/src/unpack.c b/C/src/unpack.c
@@ -32,7 +32,20 @@ At9Status UnpackFrame(Frame* frame, BitReaderCxt* br)
 	for (int i = 0; i < blockCount; i++)
 	{
 		ERROR_CHECK(UnpackBlock(&frame->Blocks[i], br));
+
+		if (frame->Blocks[i].FirstInSuperframe && frame->IndexInSuperframe)
+		{
+			return ERR_UNPACK_SUPERFRAME_FLAG_INVALID;
+		}
+	}
+
+	frame->IndexInSuperframe++;
+
+	if (frame->IndexInSuperframe == frame->Config->FramesPerSuperframe)
+	{
+		frame->IndexInSuperframe = 0;
 	}
+
 	return ERR_SUCCESS;
 }