summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHimbeerserverDE <himbeerserverde@gmail.com>2023-12-09 13:39:26 +0100
committerHimbeerserverDE <himbeerserverde@gmail.com>2023-12-09 13:39:26 +0100
commit6e821a1442c47919b6127f48e0a614abb4b5c69f (patch)
treeeb65df0692addec15d3f8d10daaadc97c65a0e3b
parentfcace8134182248e954fd750dda14da15e3944c4 (diff)
Revert "defer trailing data panic until deserialization has fully completed"
This reverts commit fcace8134182248e954fd750dda14da15e3944c4.
-rw-r--r--internal/mkserialize/mkserialize.go2
-rw-r--r--serialize.go18
2 files changed, 10 insertions, 10 deletions
diff --git a/internal/mkserialize/mkserialize.go b/internal/mkserialize/mkserialize.go
index 9b5df3b..4535aaa 100644
--- a/internal/mkserialize/mkserialize.go
+++ b/internal/mkserialize/mkserialize.go
@@ -122,7 +122,7 @@ func structPragma(c *ast.Comment, sp *[]func(), expr string, de bool) {
*sp = append(*sp, func() {
if de {
fmt.Println("if r.N > 0",
- `{ defer chk(mkDeTrailingDataError(r)) }`)
+ `{ chk(mkDeTrailingDataError(r)) }`)
} else {
fmt.Println("{")
fmt.Println("buf := w")
diff --git a/serialize.go b/serialize.go
index f34b8e6..e22a7a1 100644
--- a/serialize.go
+++ b/serialize.go
@@ -834,7 +834,7 @@ func (obj *ToSrvInteract) deserialize(r io.Reader) {
}
}
if r.N > 0 {
- defer chk(mkDeTrailingDataError(r))
+ chk(mkDeTrailingDataError(r))
}
}
if err := pcall(func() {
@@ -3682,7 +3682,7 @@ func (obj *ToCltNodeDefs) deserialize(r io.Reader) {
chk(r.Close())
}
if r.N > 0 {
- defer chk(mkDeTrailingDataError(r))
+ chk(mkDeTrailingDataError(r))
}
}
}
@@ -4101,7 +4101,7 @@ func (obj *ToCltItemDefs) deserialize(r io.Reader) {
chk(r.Close())
}
if r.N > 0 {
- defer chk(mkDeTrailingDataError(r))
+ chk(mkDeTrailingDataError(r))
}
}
}
@@ -18295,7 +18295,7 @@ func (obj *ToCltNodeMetasChanged) deserialize(r io.Reader) {
}
}
if r.N > 0 {
- defer chk(mkDeTrailingDataError(r))
+ chk(mkDeTrailingDataError(r))
}
}
}
@@ -28748,7 +28748,7 @@ func (obj *NodeDef) deserialize(r io.Reader) {
}
}
if r.N > 0 {
- defer chk(mkDeTrailingDataError(r))
+ chk(mkDeTrailingDataError(r))
}
}
}
@@ -29711,7 +29711,7 @@ func (obj *AOAdd) deserialize(r io.Reader) {
chk(fmt.Errorf("%s: %w", "github.com/HimbeerserverDE/mt.AOInitData", err))
}
if r.N > 0 {
- defer chk(mkDeTrailingDataError(r))
+ chk(mkDeTrailingDataError(r))
}
}
}
@@ -29791,7 +29791,7 @@ func (obj *IDAOMsg) deserialize(r io.Reader) {
}
}
if r.N > 0 {
- defer chk(mkDeTrailingDataError(r))
+ chk(mkDeTrailingDataError(r))
}
}
}
@@ -32485,7 +32485,7 @@ func (obj *ItemDef) deserialize(r io.Reader) {
chk(fmt.Errorf("%s: %w", "github.com/HimbeerserverDE/mt.SoundDef", err))
}
if r.N > 0 {
- defer chk(mkDeTrailingDataError(r))
+ chk(mkDeTrailingDataError(r))
}
}
}
@@ -41778,7 +41778,7 @@ func (obj *ToolCaps) deserialize(r io.Reader) {
}
}
if r.N > 0 {
- defer chk(mkDeTrailingDataError(r))
+ chk(mkDeTrailingDataError(r))
}
}
}