[PATCH] contrib/xml2: guard against signed integer overflow in parse_params

1 patchset tracked - current t139548_1

v1t139548_1posted May 04, 11:26successwon't retrystale 34dpg 20

base803583ce7 Aug 16, 23:53 on master

applyapplied Aug 17, 00:24

rebaselast tried 5 days ago on 72af14bcc

Applying: contrib/xml2: guard against signed integer overflow in parse_params
Using index info to reconstruct a base tree...
M	contrib/xml2/xslt_proc.c
Falling back to patching base and 3-way merge...
Auto-merging contrib/xml2/xslt_proc.c
CONFLICT (content): Merge conflict in contrib/xml2/xslt_proc.c
Patch failed at 0001 contrib/xml2: guard against signed integer overflow in parse_params

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

conflicts on master: contrib/xml2/xslt_proc.c

pushAug 17, 00:25 -> 22e8d1591 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1019 / 1019	2m 16s / 4m 38s	`docker run ... :t139548`	Aug 17, 00:42
run 31981963726 executed 1019 - ccache 98 hit / 6524 miss - head 22e8d1591 - digest sha256:b8cdc8bc3dc4d7... - run 31981963726
success	1	20	1019 / 1019	2m 53s / 5m 32s	`docker run ... @sha256:30c0ad6...`	Aug 16, 00:26
run 31916706721 executed 1019 - ccache 98 hit / 6524 miss - head bb3c1f3e7 - digest sha256:30c0ad6a032d7f... - run 31916706721
success	1	20	1019 / 1019	2m 10s / 4m 47s	`docker run ... @sha256:c83f59a...`	Aug 15, 00:22
run 31852881280 executed 1019 - ccache 98 hit / 6524 miss - head a8368edaa - digest sha256:c83f59ae013e06... - run 31852881280
success	1	20	1019 / 1019	2m 52s / 5m 39s	`docker run ... @sha256:2e88c02...`	Aug 14, 00:23
run 31756508058 executed 1019 - ccache 165 hit / 6457 miss - head b03fa084c - digest sha256:2e88c020c71857... - run 31756508058
success	1	20	1019 / 1019	1m 53s / 4m 06s	`docker run ... @sha256:0429b5d...`	Aug 13, 00:19
run 31653480187 executed 1019 - ccache 165 hit / 6457 miss - head 702109792 - digest sha256:0429b5d2e8a507... - run 31653480187
success	1	20	1019 / 1019	2m 55s / 5m 38s	`docker run ... @sha256:36b9917...`	Aug 12, 00:20
run 31549173417 executed 1019 - ccache 165 hit / 6453 miss - head 99c93beec - digest sha256:36b99171db7eb9... - run 31549173417
success	1	20	1019 / 1019	2m 55s / 5m 33s	`docker run ... @sha256:080339d...`	Aug 11, 00:18
run 31444932263 executed 1019 - ccache 165 hit / 6453 miss - head 6c95d5847 - digest sha256:080339d53b1c83... - run 31444932263
success	1	20	1019 / 1019	3m 02s / 5m 39s	`docker run ... @sha256:be9ce77...`	Aug 10, 00:19
run 31343534854 executed 1019 - ccache 166 hit / 6452 miss - head 21eaec28d - digest sha256:be9ce7750a016b... - run 31343534854
success	1	20	1019 / 1019	2m 59s / 5m 32s	`docker run ... @sha256:3429a9c...`	Aug 07, 16:04
run 31194816957 executed 1019 - ccache 166 hit / 6452 miss - head fbe10ffcb - digest sha256:3429a9cae1c032... - run 31194816957
success	1	20	1018 / 1018	2m 53s / 5m 38s	`docker run ... @sha256:bd39af8...`	Aug 06, 17:36
run 31117754434 executed 1018 - ccache 166 hit / 6452 miss - head 5d6b65176 - digest sha256:bd39af82e79497... - run 31117754434
success	1	20	1018 / 1018	1m 51s / 4m 03s	`docker run ... @sha256:515179d...`	Aug 05, 16:00
run 31022382663 executed 1018 - ccache 166 hit / 6452 miss - head 3a401aa1f - digest sha256:515179d722fd19... - run 31022382663
success	1	20	1018 / 1018	2m 50s / 5m 17s	`docker run ... @sha256:0ae6fd5...`	Aug 04, 16:01
run 30926187707 executed 1018 - ccache 166 hit / 6452 miss - head 4494a4fe4 - digest sha256:0ae6fd594d2b90... - run 30926187707
success	1	20	1017 / 1017	2m 55s / 5m 27s	`docker run ... @sha256:ac0b2e5...`	Aug 03, 16:01
run 30829263925 executed 1017 - ccache 166 hit / 6452 miss - head ec058f5d1 - digest sha256:ac0b2e5ba0c71d... - run 30829263925
success	1	20	1017 / 1017	2m 53s / 5m 25s	`docker run ... @sha256:6e6dfed...`	Aug 02, 15:59
run 30755176287 executed 1017 - ccache 166 hit / 6452 miss - head f40d56439 - digest sha256:6e6dfed704d649... - run 30755176287
success	1	20	1017 / 1017	2m 46s / 5m 11s	`docker run ... @sha256:5d2ee99...`	Aug 01, 15:58
run 30706694912 executed 1017 - ccache 166 hit / 6452 miss - head 2ee5d4c80 - digest sha256:5d2ee994f8598a... - run 30706694912
success	1	20	1016 / 1016	1m 59s / 4m 11s	`docker run ... @sha256:e04ff65...`	Jul 31, 15:55
run 30644311585 executed 1016 - ccache 166 hit / 6452 miss - head a7e1f44ef - digest sha256:e04ff653e56b9f... - run 30644311585
success	1	20	1016 / 1016	2m 47s / 5m 25s	`docker run ... @sha256:8e628d6...`	Jul 30, 15:57
run 30558289517 executed 1016 - ccache 166 hit / 6452 miss - head 6b2b31a13 - digest sha256:8e628d6d5c24ac... - run 30558289517
success	1	20	1016 / 1016	2m 54s / 5m 23s	`docker run ... @sha256:40ac783...`	Jul 29, 15:55
run 30467377433 executed 1016 - ccache 166 hit / 6452 miss - head 7ffce378a - digest sha256:40ac783c39fb27... - run 30467377433
success	1	20	1014 / 1014	2m 54s / 5m 32s	`docker run ... @sha256:a121381...`	Jul 28, 15:55
run 30374821354 executed 1014 - ccache 166 hit / 6452 miss - head d2a8c93ec - digest sha256:a1213814ead874... - run 30374821354
success	1	20	1013 / 1013	2m 59s / 5m 28s	`docker run ... @sha256:e288e9f...`	Jul 27, 00:57
run 30228242573 executed 1013 - ccache 166 hit / 6452 miss - head 5207c931f - digest sha256:e288e9f3b26830... - run 30228242573