Like der_focus(), debugged der_skip() and der_enter()

- they were interpreting der_header() as der_header2() - so they now use that function
vanrein · Apr 23, 2019 · 3bf22b1 · 3bf22b1
1 parent b7fcda4
commit 3bf22b1
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/der_skipenter.c b/lib/der_skipenter.c
@@ -9,13 +9,13 @@ int der_skip (dercursor *crs) {
 	uint8_t tag;
 	uint8_t hlen;
 	size_t len;
-	if (der_header (crs, &tag, &len, &hlen)) {
+	if (der_header2 (*crs, &tag, &len, &hlen)) {
 		crs->derptr = NULL;
 		crs->derlen = 0;
 		return -1;
 	} else {
-		crs->derptr += len;
-		crs->derlen -= len;
+		crs->derptr += hlen + len;
+		crs->derlen -= hlen + len;
 		return 0;
 	}
 }
@@ -59,8 +59,7 @@ int der_focus (dercursor *crs) {
 	uint8_t tag;
 	uint8_t hlen;
 	size_t len;
-	dercursor crs2 = *crs;
-	if (der_header2 (crs2, &tag, &len, &hlen)) {
+	if (der_header2 (*crs, &tag, &len, &hlen)) {
 		crs->derptr = NULL;
 		crs->derlen = 0;
 		return -1;