210291 2020-04-09 11:05:53 -0700 Add null pointer checkings in WebFullScreenManager 2020-04-10 08:54:56 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 peng.liu6 peng.liu6 eric.carlson jer.noble webkit-bug-importer oldest_to_newest 1639725 0 peng.liu6 2020-04-09 11:05:53 -0700 Add null pointer checking in WebFullScreenManager 1639728 1 peng.liu6 2020-04-09 11:07:28 -0700 <rdar://problem/54461890> 1639731 2 395977 peng.liu6 2020-04-09 11:11:38 -0700 Created attachment 395977 Patch 1640008 3 395977 dbates 2020-04-09 20:39:34 -0700 Comment on attachment 395977 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395977&action=review Patch looks good. A better patch would explain why this is being done in the change log description. > Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.cpp:54 > + if (!element) Ok as is. No change needed. Is the purpose of this change to workaround an unreproducible bug? Is so then the the optimal solution would include a FIXME comment explaining this/referencing the bug for the root cause fix. If not, then The optimal solution is to remove the assert. Same comment for all changes below. 1640017 4 395977 peng.liu6 2020-04-09 20:56:16 -0700 Comment on attachment 395977 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395977&action=review >> Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.cpp:54 >> + if (!element) > > Ok as is. No change needed. Is the purpose of this change to workaround an unreproducible bug? Is so then the the optimal solution would include a FIXME comment explaining this/referencing the bug for the root cause fix. If not, then The optimal solution is to remove the assert. > > Same comment for all changes below. Thanks for the review. Right, this patch is to fix a hard to reproduce crash. 1640036 5 396047 peng.liu6 2020-04-09 22:20:29 -0700 Created attachment 396047 Patch for landing 1640191 6 ews-feeder 2020-04-10 08:54:56 -0700 Committed r259874: <https://trac.webkit.org/changeset/259874> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396047. 395977 2020-04-09 11:11:38 -0700 2020-04-09 20:57:25 -0700 Patch bug-210291-20200409111137.patch text/plain 4954 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY2NDg0NmMwM2FkN2Q3MzJi NThiZDFkMGJiNGIyZmE3Y2ZmYzFlZDguLjVmZTA1MjZjOTVhODZjNWUyY2M4M2JkMzc0YWM0YzA1 ZmEyNDMwOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjAtMDQtMDkgIFBlbmcgTGl1 ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgbnVsbCBwb2ludGVyIGNoZWNr aW5ncyBpbiBXZWJGdWxsU2NyZWVuTWFuYWdlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMjkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkIG51bGwgcG9pbnRlciBjaGVja2luZ3MgZm9yICJlbGVt ZW50IiBhbmQgIm1fZWxlbWVudCIgaW4gV2ViRnVsbFNjcmVlbk1hbmFnZXIuCisKKyAgICAgICAg KiBXZWJQcm9jZXNzL0Z1bGxTY3JlZW4vV2ViRnVsbFNjcmVlbk1hbmFnZXIuY3BwOgorICAgICAg ICAoV2ViS2l0OjpzY3JlZW5SZWN0T2ZDb250ZW50cyk6CisgICAgICAgIChXZWJLaXQ6OldlYkZ1 bGxTY3JlZW5NYW5hZ2VyOjplbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KToKKyAgICAgICAgKFdl YktpdDo6V2ViRnVsbFNjcmVlbk1hbmFnZXI6OmV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudCk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyOjp3aWxsRW50ZXJGdWxsU2NyZWVu KToKKyAgICAgICAgKFdlYktpdDo6V2ViRnVsbFNjcmVlbk1hbmFnZXI6OmRpZEVudGVyRnVsbFNj cmVlbik6CisgICAgICAgIChXZWJLaXQ6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyOjp3aWxsRXhpdEZ1 bGxTY3JlZW4pOgorICAgICAgICAoV2ViS2l0OjpXZWJGdWxsU2NyZWVuTWFuYWdlcjo6ZGlkRXhp dEZ1bGxTY3JlZW4pOgorICAgICAgICAoV2ViS2l0OjpXZWJGdWxsU2NyZWVuTWFuYWdlcjo6c2V0 QW5pbWF0aW5nRnVsbFNjcmVlbik6CisgICAgICAgIChXZWJLaXQ6OldlYkZ1bGxTY3JlZW5NYW5h Z2VyOjpyZXF1ZXN0RXhpdEZ1bGxTY3JlZW4pOgorCiAyMDIwLTA0LTA4ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgUmVncmVzc2lvbihyMjU5NjEwKSBbUkJTVGFy Z2V0IHRhcmdldFdpdGhQaWQ6XSBtYXkgdGhyb3cgYSAnbXVzdCBzcGVjaWZ5IGEgdmFsaWQgcGlk JyBleGNlcHRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9GdWxsU2Ny ZWVuL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9G dWxsU2NyZWVuL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyLmNwcAppbmRleCAyMTgyNDhhMjQ5YzEwZjY0 Mjc3ZTY0N2YzMWQyZTVjODFmYTZlYjI5Li40NzFiYjBkMTI1MDFhMjMxYzU5NTQwOTNlMDM1YmU2 NmJiNTg0OGZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvRnVsbFNjcmVl bi9XZWJGdWxsU2NyZWVuTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L0Z1bGxTY3JlZW4vV2ViRnVsbFNjcmVlbk1hbmFnZXIuY3BwCkBAIC01MSw2ICs1MSw5IEBAIG5h bWVzcGFjZSBXZWJLaXQgewogc3RhdGljIFdlYkNvcmU6OkludFJlY3Qgc2NyZWVuUmVjdE9mQ29u dGVudHMoV2ViQ29yZTo6RWxlbWVudCogZWxlbWVudCkKIHsKICAgICBBU1NFUlQoZWxlbWVudCk7 CisgICAgaWYgKCFlbGVtZW50KQorICAgICAgICByZXR1cm4geyB9OworCiAgICAgaWYgKGVsZW1l bnQtPnJlbmRlcmVyKCkgJiYgZWxlbWVudC0+cmVuZGVyZXIoKS0+aGFzTGF5ZXIoKSAmJiBlbGVt ZW50LT5yZW5kZXJlcigpLT5lbmNsb3NpbmdMYXllcigpLT5pc0NvbXBvc2l0ZWQoKSkgewogICAg ICAgICBXZWJDb3JlOjpGbG9hdFF1YWQgY29udGVudHNCb3ggPSBzdGF0aWNfY2FzdDxXZWJDb3Jl OjpGbG9hdFJlY3Q+KGVsZW1lbnQtPnJlbmRlcmVyKCktPmVuY2xvc2luZ0xheWVyKCktPmJhY2tp bmcoKS0+Y29udGVudHNCb3goKSk7CiAgICAgICAgIGNvbnRlbnRzQm94ID0gZWxlbWVudC0+cmVu ZGVyZXIoKS0+bG9jYWxUb0Fic29sdXRlUXVhZChjb250ZW50c0JveCk7CkBAIC0xMzAsNiArMTMz LDggQEAgdm9pZCBXZWJGdWxsU2NyZWVuTWFuYWdlcjo6ZW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVu dChXZWJDb3JlOjpFbGVtZW50KiBlbGVtZW50KQogICAgIExPRyhGdWxsc2NyZWVuLCAiV2ViRnVs bFNjcmVlbk1hbmFnZXIgJXAgZW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudCglcCkiLCB0aGlzLCBl bGVtZW50KTsKIAogICAgIEFTU0VSVChlbGVtZW50KTsKKyAgICBpZiAoIWVsZW1lbnQpCisgICAg ICAgIHJldHVybjsKICAgICBtX2VsZW1lbnQgPSBlbGVtZW50OwogICAgIG1faW5pdGlhbEZyYW1l ID0gc2NyZWVuUmVjdE9mQ29udGVudHMobV9lbGVtZW50LmdldCgpKTsKICAgICBtX3BhZ2UtPmlu amVjdGVkQnVuZGxlRnVsbFNjcmVlbkNsaWVudCgpLmVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQo bV9wYWdlLmdldCgpLCBlbGVtZW50KTsKQEAgLTEzOCwxMiArMTQzLDE4IEBAIHZvaWQgV2ViRnVs bFNjcmVlbk1hbmFnZXI6OmVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQoV2ViQ29yZTo6RWxlbWVu dCogZWxlbWVudCkKIHZvaWQgV2ViRnVsbFNjcmVlbk1hbmFnZXI6OmV4aXRGdWxsU2NyZWVuRm9y RWxlbWVudChXZWJDb3JlOjpFbGVtZW50KiBlbGVtZW50KQogewogICAgIExPRyhGdWxsc2NyZWVu LCAiV2ViRnVsbFNjcmVlbk1hbmFnZXIgJXAgZXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KCVwKSAt IGZ1bGxzY3JlZW4gZWxlbWVudCAlcCIsIHRoaXMsIGVsZW1lbnQsIG1fZWxlbWVudC5nZXQoKSk7 CisgICAgQVNTRVJUKGVsZW1lbnQpOworICAgIGlmICghZWxlbWVudCkKKyAgICAgICAgcmV0dXJu OwogICAgIG1fcGFnZS0+aW5qZWN0ZWRCdW5kbGVGdWxsU2NyZWVuQ2xpZW50KCkuZXhpdEZ1bGxT Y3JlZW5Gb3JFbGVtZW50KG1fcGFnZS5nZXQoKSwgZWxlbWVudCk7CiB9CiAKIHZvaWQgV2ViRnVs bFNjcmVlbk1hbmFnZXI6OndpbGxFbnRlckZ1bGxTY3JlZW4oKQogewogICAgIExPRyhGdWxsc2Ny ZWVuLCAiV2ViRnVsbFNjcmVlbk1hbmFnZXIgJXAgd2lsbEVudGVyRnVsbFNjcmVlbigpIC0gZWxl bWVudCAlcCIsIHRoaXMsIG1fZWxlbWVudC5nZXQoKSk7CisgICAgQVNTRVJUKG1fZWxlbWVudCk7 CisgICAgaWYgKCFtX2VsZW1lbnQpCisgICAgICAgIHJldHVybjsKIAogICAgIG1fZWxlbWVudC0+ ZG9jdW1lbnQoKS5mdWxsc2NyZWVuTWFuYWdlcigpLndpbGxFbnRlckZ1bGxzY3JlZW4oKm1fZWxl bWVudCk7CiAjaWYgIVBMQVRGT1JNKElPU19GQU1JTFkpCkBAIC0xNTgsNiArMTY5LDkgQEAgdm9p ZCBXZWJGdWxsU2NyZWVuTWFuYWdlcjo6d2lsbEVudGVyRnVsbFNjcmVlbigpCiB2b2lkIFdlYkZ1 bGxTY3JlZW5NYW5hZ2VyOjpkaWRFbnRlckZ1bGxTY3JlZW4oKQogewogICAgIExPRyhGdWxsc2Ny ZWVuLCAiV2ViRnVsbFNjcmVlbk1hbmFnZXIgJXAgZGlkRW50ZXJGdWxsU2NyZWVuKCkgLSBlbGVt ZW50ICVwIiwgdGhpcywgbV9lbGVtZW50LmdldCgpKTsKKyAgICBBU1NFUlQobV9lbGVtZW50KTsK KyAgICBpZiAoIW1fZWxlbWVudCkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgbV9lbGVtZW50LT5k b2N1bWVudCgpLmZ1bGxzY3JlZW5NYW5hZ2VyKCkuZGlkRW50ZXJGdWxsc2NyZWVuKCk7CiAKQEAg LTE3MSw2ICsxODUsOCBAQCB2b2lkIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyOjp3aWxsRXhpdEZ1bGxT Y3JlZW4oKQogewogICAgIExPRyhGdWxsc2NyZWVuLCAiV2ViRnVsbFNjcmVlbk1hbmFnZXIgJXAg d2lsbEV4aXRGdWxsU2NyZWVuKCkgLSBlbGVtZW50ICVwIiwgdGhpcywgbV9lbGVtZW50LmdldCgp KTsKICAgICBBU1NFUlQobV9lbGVtZW50KTsKKyAgICBpZiAoIW1fZWxlbWVudCkKKyAgICAgICAg cmV0dXJuOwogCiAjaWYgRU5BQkxFKFZJREVPKQogICAgIHNldFBJUFN0YW5kYnlFbGVtZW50KG51 bGxwdHIpOwpAQCAtMTg3LDYgKzIwMyw5IEBAIHZvaWQgV2ViRnVsbFNjcmVlbk1hbmFnZXI6Ondp bGxFeGl0RnVsbFNjcmVlbigpCiB2b2lkIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyOjpkaWRFeGl0RnVs bFNjcmVlbigpCiB7CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJGdWxsU2NyZWVuTWFuYWdlciAl cCBkaWRFeGl0RnVsbFNjcmVlbigpIC0gZWxlbWVudCAlcCIsIHRoaXMsIG1fZWxlbWVudC5nZXQo KSk7CisgICAgQVNTRVJUKG1fZWxlbWVudCk7CisgICAgaWYgKCFtX2VsZW1lbnQpCisgICAgICAg IHJldHVybjsKIAogICAgIEFTU0VSVChtX2VsZW1lbnQpOwogICAgIHNldEZ1bGxzY3JlZW5JbnNl dHMoV2ViQ29yZTo6RmxvYXRCb3hFeHRlbnQoKSk7CkBAIC0xOTcsMTIgKzIxNiwxNiBAQCB2b2lk IFdlYkZ1bGxTY3JlZW5NYW5hZ2VyOjpkaWRFeGl0RnVsbFNjcmVlbigpCiB2b2lkIFdlYkZ1bGxT Y3JlZW5NYW5hZ2VyOjpzZXRBbmltYXRpbmdGdWxsU2NyZWVuKGJvb2wgYW5pbWF0aW5nKQogewog ICAgIEFTU0VSVChtX2VsZW1lbnQpOworICAgIGlmICghbV9lbGVtZW50KQorICAgICAgICByZXR1 cm47CiAgICAgbV9lbGVtZW50LT5kb2N1bWVudCgpLmZ1bGxzY3JlZW5NYW5hZ2VyKCkuc2V0QW5p bWF0aW5nRnVsbHNjcmVlbihhbmltYXRpbmcpOwogfQogCiB2b2lkIFdlYkZ1bGxTY3JlZW5NYW5h Z2VyOjpyZXF1ZXN0RXhpdEZ1bGxTY3JlZW4oKQogewogICAgIEFTU0VSVChtX2VsZW1lbnQpOwor ICAgIGlmICghbV9lbGVtZW50KQorICAgICAgICByZXR1cm47CiAgICAgbV9lbGVtZW50LT5kb2N1 bWVudCgpLmZ1bGxzY3JlZW5NYW5hZ2VyKCkuY2FuY2VsRnVsbHNjcmVlbigpOwogfQogCg== 396047 2020-04-09 22:20:29 -0700 2020-04-10 08:54:56 -0700 Patch for landing bug-210291-20200409222028.patch text/plain 4576 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5ODQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBkY2Q0NGYyZDgxODcxOTM1 YjkwNDJiOWJhY2NhZTNkZTk4ZjExNjAuLjhiNjFiMzA4YTk2MmZhYzQwZDU4NDE4NjRhYzgwNDY1 ZjBlYWU3YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDQtMDkgIFBlbmcgTGl1 ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgbnVsbCBwb2ludGVyIGNoZWNr aW5ncyBpbiBXZWJGdWxsU2NyZWVuTWFuYWdlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMjkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFuaWVs IEJhdGVzLgorCisgICAgICAgIEFkZCBudWxsIHBvaW50ZXIgY2hlY2tpbmdzIGZvciAiZWxlbWVu dCIgYW5kICJtX2VsZW1lbnQiIGluIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyLgorCisgICAgICAgICog V2ViUHJvY2Vzcy9GdWxsU2NyZWVuL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyLmNwcDoKKyAgICAgICAg KFdlYktpdDo6c2NyZWVuUmVjdE9mQ29udGVudHMpOgorICAgICAgICAoV2ViS2l0OjpXZWJGdWxs U2NyZWVuTWFuYWdlcjo6ZW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudCk6CisgICAgICAgIChXZWJL aXQ6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyOjp3aWxsRW50ZXJGdWxsU2NyZWVuKToKKyAgICAgICAg KFdlYktpdDo6V2ViRnVsbFNjcmVlbk1hbmFnZXI6OmRpZEVudGVyRnVsbFNjcmVlbik6CisgICAg ICAgIChXZWJLaXQ6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyOjp3aWxsRXhpdEZ1bGxTY3JlZW4pOgor ICAgICAgICAoV2ViS2l0OjpXZWJGdWxsU2NyZWVuTWFuYWdlcjo6ZGlkRXhpdEZ1bGxTY3JlZW4p OgorICAgICAgICAoV2ViS2l0OjpXZWJGdWxsU2NyZWVuTWFuYWdlcjo6c2V0QW5pbWF0aW5nRnVs bFNjcmVlbik6CisgICAgICAgIChXZWJLaXQ6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyOjpyZXF1ZXN0 RXhpdEZ1bGxTY3JlZW4pOgorCiAyMDIwLTA0LTA4ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxl LmNvbT4KIAogICAgICAgICBbQ29jb2FdIFNpbXBsaWZ5IE5TQXJyYXksIE5TRGljdGlvbmFyeSwg YW5kIE5TTnVtYmVyIGlkaW9tcyB0aHJvdWdob3V0IFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4vV2ViRnVsbFNjcmVlbk1hbmFnZXIuY3BwIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4vV2ViRnVsbFNjcmVlbk1hbmFnZXIu Y3BwCmluZGV4IDIxODI0OGEyNDljMTBmNjQyNzdlNjQ3ZjMxZDJlNWM4MWZhNmViMjkuLjJmMmI2 ZWNjMjdjMjRkNGViY2M2YjY4ZDQzOWNhNzY3N2Q5Nzc2YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9GdWxsU2NyZWVuL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvRnVsbFNjcmVlbi9XZWJGdWxsU2NyZWVuTWFuYWdl ci5jcHAKQEAgLTUxLDYgKzUxLDkgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBzdGF0aWMgV2ViQ29y ZTo6SW50UmVjdCBzY3JlZW5SZWN0T2ZDb250ZW50cyhXZWJDb3JlOjpFbGVtZW50KiBlbGVtZW50 KQogewogICAgIEFTU0VSVChlbGVtZW50KTsKKyAgICBpZiAoIWVsZW1lbnQpCisgICAgICAgIHJl dHVybiB7IH07CisKICAgICBpZiAoZWxlbWVudC0+cmVuZGVyZXIoKSAmJiBlbGVtZW50LT5yZW5k ZXJlcigpLT5oYXNMYXllcigpICYmIGVsZW1lbnQtPnJlbmRlcmVyKCktPmVuY2xvc2luZ0xheWVy KCktPmlzQ29tcG9zaXRlZCgpKSB7CiAgICAgICAgIFdlYkNvcmU6OkZsb2F0UXVhZCBjb250ZW50 c0JveCA9IHN0YXRpY19jYXN0PFdlYkNvcmU6OkZsb2F0UmVjdD4oZWxlbWVudC0+cmVuZGVyZXIo KS0+ZW5jbG9zaW5nTGF5ZXIoKS0+YmFja2luZygpLT5jb250ZW50c0JveCgpKTsKICAgICAgICAg Y29udGVudHNCb3ggPSBlbGVtZW50LT5yZW5kZXJlcigpLT5sb2NhbFRvQWJzb2x1dGVRdWFkKGNv bnRlbnRzQm94KTsKQEAgLTEzMCw2ICsxMzMsOCBAQCB2b2lkIFdlYkZ1bGxTY3JlZW5NYW5hZ2Vy OjplbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KFdlYkNvcmU6OkVsZW1lbnQqIGVsZW1lbnQpCiAg ICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJGdWxsU2NyZWVuTWFuYWdlciAlcCBlbnRlckZ1bGxTY3Jl ZW5Gb3JFbGVtZW50KCVwKSIsIHRoaXMsIGVsZW1lbnQpOwogCiAgICAgQVNTRVJUKGVsZW1lbnQp OworICAgIGlmICghZWxlbWVudCkKKyAgICAgICAgcmV0dXJuOwogICAgIG1fZWxlbWVudCA9IGVs ZW1lbnQ7CiAgICAgbV9pbml0aWFsRnJhbWUgPSBzY3JlZW5SZWN0T2ZDb250ZW50cyhtX2VsZW1l bnQuZ2V0KCkpOwogICAgIG1fcGFnZS0+aW5qZWN0ZWRCdW5kbGVGdWxsU2NyZWVuQ2xpZW50KCku ZW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudChtX3BhZ2UuZ2V0KCksIGVsZW1lbnQpOwpAQCAtMTQ0 LDYgKzE0OSw5IEBAIHZvaWQgV2ViRnVsbFNjcmVlbk1hbmFnZXI6OmV4aXRGdWxsU2NyZWVuRm9y RWxlbWVudChXZWJDb3JlOjpFbGVtZW50KiBlbGVtZW50KQogdm9pZCBXZWJGdWxsU2NyZWVuTWFu YWdlcjo6d2lsbEVudGVyRnVsbFNjcmVlbigpCiB7CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJG dWxsU2NyZWVuTWFuYWdlciAlcCB3aWxsRW50ZXJGdWxsU2NyZWVuKCkgLSBlbGVtZW50ICVwIiwg dGhpcywgbV9lbGVtZW50LmdldCgpKTsKKyAgICBBU1NFUlQobV9lbGVtZW50KTsKKyAgICBpZiAo IW1fZWxlbWVudCkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgbV9lbGVtZW50LT5kb2N1bWVudCgp LmZ1bGxzY3JlZW5NYW5hZ2VyKCkud2lsbEVudGVyRnVsbHNjcmVlbigqbV9lbGVtZW50KTsKICNp ZiAhUExBVEZPUk0oSU9TX0ZBTUlMWSkKQEAgLTE1OCw2ICsxNjYsOSBAQCB2b2lkIFdlYkZ1bGxT Y3JlZW5NYW5hZ2VyOjp3aWxsRW50ZXJGdWxsU2NyZWVuKCkKIHZvaWQgV2ViRnVsbFNjcmVlbk1h bmFnZXI6OmRpZEVudGVyRnVsbFNjcmVlbigpCiB7CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJG dWxsU2NyZWVuTWFuYWdlciAlcCBkaWRFbnRlckZ1bGxTY3JlZW4oKSAtIGVsZW1lbnQgJXAiLCB0 aGlzLCBtX2VsZW1lbnQuZ2V0KCkpOworICAgIEFTU0VSVChtX2VsZW1lbnQpOworICAgIGlmICgh bV9lbGVtZW50KQorICAgICAgICByZXR1cm47CiAKICAgICBtX2VsZW1lbnQtPmRvY3VtZW50KCku ZnVsbHNjcmVlbk1hbmFnZXIoKS5kaWRFbnRlckZ1bGxzY3JlZW4oKTsKIApAQCAtMTcxLDYgKzE4 Miw4IEBAIHZvaWQgV2ViRnVsbFNjcmVlbk1hbmFnZXI6OndpbGxFeGl0RnVsbFNjcmVlbigpCiB7 CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJGdWxsU2NyZWVuTWFuYWdlciAlcCB3aWxsRXhpdEZ1 bGxTY3JlZW4oKSAtIGVsZW1lbnQgJXAiLCB0aGlzLCBtX2VsZW1lbnQuZ2V0KCkpOwogICAgIEFT U0VSVChtX2VsZW1lbnQpOworICAgIGlmICghbV9lbGVtZW50KQorICAgICAgICByZXR1cm47CiAK ICNpZiBFTkFCTEUoVklERU8pCiAgICAgc2V0UElQU3RhbmRieUVsZW1lbnQobnVsbHB0cik7CkBA IC0xODcsOCArMjAwLDEwIEBAIHZvaWQgV2ViRnVsbFNjcmVlbk1hbmFnZXI6OndpbGxFeGl0RnVs bFNjcmVlbigpCiB2b2lkIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyOjpkaWRFeGl0RnVsbFNjcmVlbigp CiB7CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJGdWxsU2NyZWVuTWFuYWdlciAlcCBkaWRFeGl0 RnVsbFNjcmVlbigpIC0gZWxlbWVudCAlcCIsIHRoaXMsIG1fZWxlbWVudC5nZXQoKSk7Ci0KICAg ICBBU1NFUlQobV9lbGVtZW50KTsKKyAgICBpZiAoIW1fZWxlbWVudCkKKyAgICAgICAgcmV0dXJu OworCiAgICAgc2V0RnVsbHNjcmVlbkluc2V0cyhXZWJDb3JlOjpGbG9hdEJveEV4dGVudCgpKTsK ICAgICBzZXRGdWxsc2NyZWVuQXV0b0hpZGVEdXJhdGlvbigwX3MpOwogICAgIG1fZWxlbWVudC0+ ZG9jdW1lbnQoKS5mdWxsc2NyZWVuTWFuYWdlcigpLmRpZEV4aXRGdWxsc2NyZWVuKCk7CkBAIC0x OTcsMTIgKzIxMiwxNiBAQCB2b2lkIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyOjpkaWRFeGl0RnVsbFNj cmVlbigpCiB2b2lkIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyOjpzZXRBbmltYXRpbmdGdWxsU2NyZWVu KGJvb2wgYW5pbWF0aW5nKQogewogICAgIEFTU0VSVChtX2VsZW1lbnQpOworICAgIGlmICghbV9l bGVtZW50KQorICAgICAgICByZXR1cm47CiAgICAgbV9lbGVtZW50LT5kb2N1bWVudCgpLmZ1bGxz Y3JlZW5NYW5hZ2VyKCkuc2V0QW5pbWF0aW5nRnVsbHNjcmVlbihhbmltYXRpbmcpOwogfQogCiB2 b2lkIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyOjpyZXF1ZXN0RXhpdEZ1bGxTY3JlZW4oKQogewogICAg IEFTU0VSVChtX2VsZW1lbnQpOworICAgIGlmICghbV9lbGVtZW50KQorICAgICAgICByZXR1cm47 CiAgICAgbV9lbGVtZW50LT5kb2N1bWVudCgpLmZ1bGxzY3JlZW5NYW5hZ2VyKCkuY2FuY2VsRnVs bHNjcmVlbigpOwogfQogCg==