Fix solv_zchunk decoding error if large chunks are used

mlschroe · mlschroe · commit a7cbcc3a5cfa · 2019-12-19T16:31:09.000+01:00
Oops. This commit is a bit embarassing.
diff --git a/ext/solv_zchunk.c b/ext/solv_zchunk.c
@@ -75,12 +75,12 @@ getuint(unsigned char *p, unsigned char *endp, unsigned int *dp)
     }
   if (++p < endp && (*p & 0x80) != 0)
     {
-      *dp = p[-3] ^ (p[-2] << 7) ^ (p[1] << 14) ^ ((p[0] ^ 0x80) << 21);
+      *dp = p[-3] ^ (p[-2] << 7) ^ (p[-1] << 14) ^ ((p[0] ^ 0x80) << 21);
       return p + 1;
     }
   if (++p < endp && (*p & 0xf0) == 0x80)
     {
-      *dp = p[-4] ^ (p[-3] << 7) ^ (p[2] << 14) ^ (p[1] << 21) ^ ((p[0] ^ 0x80) << 28);
+      *dp = p[-4] ^ (p[-3] << 7) ^ (p[-2] << 14) ^ (p[-1] << 21) ^ ((p[0] ^ 0x80) << 28);
       return p + 1;
     }
   return 0;
diff --git a/package/libsolv.changes b/package/libsolv.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec 19 16:29:52 CET 2019 - mls@suse.de
+
+- fix solv_zchunk decoding error if large chunks are used
+  [bnc#1159314]
+
 -------------------------------------------------------------------
 Tue Dec 10 21:02:31 CET 2019 - mls@suse.de
 

Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,12 @@ getuint(unsigned char p, unsigned char endp, unsigned int *dp)`
`75`	`75`	`}`
`76`	`76`	`if (++p < endp && (*p & 0x80) != 0)`
`77`	`77`	`{`
`78`		`- *dp = p[-3] ^ (p[-2] << 7) ^ (p[1] << 14) ^ ((p[0] ^ 0x80) << 21);`
	`78`	`+ *dp = p[-3] ^ (p[-2] << 7) ^ (p[-1] << 14) ^ ((p[0] ^ 0x80) << 21);`
`79`	`79`	`return p + 1;`
`80`	`80`	`}`
`81`	`81`	`if (++p < endp && (*p & 0xf0) == 0x80)`
`82`	`82`	`{`
`83`		`- *dp = p[-4] ^ (p[-3] << 7) ^ (p[2] << 14) ^ (p[1] << 21) ^ ((p[0] ^ 0x80) << 28);`
	`83`	`+ *dp = p[-4] ^ (p[-3] << 7) ^ (p[-2] << 14) ^ (p[-1] << 21) ^ ((p[0] ^ 0x80) << 28);`
`84`	`84`	`return p + 1;`
`85`	`85`	`}`
`86`	`86`	`return 0;`
-Original file line number
+Diff line change
@@ @@ -1,3 +1,9 @@ @@
 +-------------------------------------------------------------------
 +Thu Dec 19 16:29:52 CET 2019 - [email protected]
++
 +- fix solv_zchunk decoding error if large chunks are used
 +  [bnc#1159314]
++
 -------------------------------------------------------------------
 Tue Dec 10 21:02:31 CET 2019 - [email protected]