199423 2019-07-02 14:46:56 -0700 Make sure to cross-thread copy in StorageManager when hopping back to the main thread 2019-07-03 10:29:17 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf beidson cdumez commit-queue sihui_liu webkit-bug-importer oldest_to_newest 1549723 0 youennf 2019-07-02 14:46:56 -0700 Make sure to cross-thread copy in StorageManager when hopping back to the main thread 1549726 1 373364 youennf 2019-07-02 14:59:20 -0700 Created attachment 373364 Patch 1549753 2 373367 youennf 2019-07-02 15:46:39 -0700 Created attachment 373367 Patch 1549777 3 373367 cdumez 2019-07-02 16:37:35 -0700 Comment on attachment 373367 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373367&action=review > Source/WebKit/NetworkProcess/WebStorage/LocalStorageDatabaseTracker.cpp:132 > +Vector<LocalStorageDatabaseTracker::OriginDetails> LocalStorageDatabaseTracker::originDetailsIsolatedCopy() What's getting isolatedCopied here? It is not obvious to me from looking at the implementation. 1549779 4 373367 youennf 2019-07-02 16:43:10 -0700 Comment on attachment 373367 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373367&action=review >> Source/WebKit/NetworkProcess/WebStorage/LocalStorageDatabaseTracker.cpp:132 >> +Vector<LocalStorageDatabaseTracker::OriginDetails> LocalStorageDatabaseTracker::originDetailsIsolatedCopy() > > What's getting isolatedCopied here? It is not obvious to me from looking at the implementation. There is nothing getting copied but I want to make it clear that this method is generating already isolated strings here. Initially, when reading the code, I thought there might be an issue and was thinking of isolating-copy at call site. Maybe another name might be better or adding an ASSERT at call site? 1549783 5 373367 cdumez 2019-07-02 16:51:49 -0700 Comment on attachment 373367 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373367&action=review >>> Source/WebKit/NetworkProcess/WebStorage/LocalStorageDatabaseTracker.cpp:132 >>> +Vector<LocalStorageDatabaseTracker::OriginDetails> LocalStorageDatabaseTracker::originDetailsIsolatedCopy() >> >> What's getting isolatedCopied here? It is not obvious to me from looking at the implementation. > > There is nothing getting copied but I want to make it clear that this method is generating already isolated strings here. > Initially, when reading the code, I thought there might be an issue and was thinking of isolating-copy at call site. > Maybe another name might be better or adding an ASSERT at call site? Why not isolateCopy() at call site? Nothing guarantees that origin.databaseIdentifier() returns a String that is isolated. It might be safe now but no guarantee that origin.databaseIdentifier() does not get updated in the future. 1549787 6 youennf 2019-07-02 16:55:35 -0700 (In reply to Chris Dumez from comment #5) > Comment on attachment 373367 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=373367&action=review > > >>> Source/WebKit/NetworkProcess/WebStorage/LocalStorageDatabaseTracker.cpp:132 > >>> +Vector<LocalStorageDatabaseTracker::OriginDetails> LocalStorageDatabaseTracker::originDetailsIsolatedCopy() > >> > >> What's getting isolatedCopied here? It is not obvious to me from looking at the implementation. > > > > There is nothing getting copied but I want to make it clear that this method is generating already isolated strings here. > > Initially, when reading the code, I thought there might be an issue and was thinking of isolating-copy at call site. > > Maybe another name might be better or adding an ASSERT at call site? > > Why not isolateCopy() at call site? Nothing guarantees that > origin.databaseIdentifier() returns a String that is isolated. It might be > safe now but no guarantee that origin.databaseIdentifier() does not get > updated in the future. Yeah, this should not be called that often so let's do it. 1549790 7 373372 youennf 2019-07-02 16:58:37 -0700 Created attachment 373372 Patch 1549924 8 373372 commit-queue 2019-07-03 10:28:59 -0700 Comment on attachment 373372 Patch Clearing flags on attachment: 373372 Committed r247092: <https://trac.webkit.org/changeset/247092> 1549925 9 commit-queue 2019-07-03 10:29:00 -0700 All reviewed patches have been landed. Closing bug. 1549926 10 webkit-bug-importer 2019-07-03 10:29:17 -0700 <rdar://problem/52596472> 373364 2019-07-02 14:59:20 -0700 2019-07-02 15:46:38 -0700 Patch bug-199423-20190702145920.patch text/plain 7231 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2ODgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2MzFhY2NjYmZiYTUwNTQ4 MGY1YWE3MGE0ZDYzMTUxOWYzY2NlNTAuLmYyZjU2ODgzOWIzMTA0OTg2MDRlNTg5NmEyNTQ4MTkz ZDdlMTVlOGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDctMDIgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSB0byBjcm9zcy10 aHJlYWQgY29weSBpbiBTdG9yYWdlTWFuYWdlciB3aGVuIGhvcHBpbmcgYmFjayB0byB0aGUgbWFp biB0aHJlYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5OTQyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE1ha2Ugc3VyZSB0byBpc29sYXRlIGNvcHkgc29tZSBzdHJpbmdzIHRoYXQgbWF5IG5vdCBiZSBp c29sYXRlZCBpbiBjYXNlIG9mIGVwaGVtZXJhbCBzZXNzaW9ucy4KKyAgICAgICAgUmVuYW1lIG9y aWdpbkRldGFpbHMgdG8gb3JpZ2luRGV0YWlsc0lzb2xhdGVkQ29weSB0byBjbGFyaWZ5IHRoZSBz dHJpbmdzIGFyZSBpc29sYXRlZC4KKyAgICAgICAgU21hbGwgcmVmYWN0b3JpbmcgdG8gdXNlIGNy b3NzVGhyZWFkQ29weSBpbnN0ZWFkIG9mIGRvaW5nIHZlY3RvciBjb3B5IG91cnNlbHZlcy4KKwor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VU cmFja2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2Vy OjpvcmlnaW5EZXRhaWxzSXNvbGF0ZWRDb3B5KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9X ZWJTdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5oOgorICAgICAgICAqIE5ldHdv cmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0 OjpTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlU2Vzc2lvblN0b3JhZ2VFbnRyaWVzRm9yT3JpZ2lucyk6 CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpnZXRMb2NhbFN0b3JhZ2VPcmlnaW5z KToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmdldExvY2FsU3RvcmFnZU9yaWdp bkRldGFpbHMpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxT dG9yYWdlRW50cmllc0Zvck9yaWdpbnMpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1dlYlN0 b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaDoKKwogMjAxOS0wNy0wMiAgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU3RvcmFnZU1hbmFnZXIgZG9lcyBub3QgbmVlZCB0 byBiZSBhIFdvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZlciBhbnltb3JlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VU cmFja2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9Mb2Nh bFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwCmluZGV4IDg4OTg3YTQ1Y2Q0ZmI5YzJjYmYxZjA0 ZDhhMmUwMDg1ZDA1MmUwMTAuLjEzOWQ3NThjMDA3YTkzYjlmMjU4YjNjMGZmNWI4Y2YzN2Q1YWU4 ZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9M b2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvV2ViU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwCkBAIC0x MjksNyArMTI5LDcgQEAgVmVjdG9yPFNlY3VyaXR5T3JpZ2luRGF0YT4gTG9jYWxTdG9yYWdlRGF0 YWJhc2VUcmFja2VyOjpvcmlnaW5zKCkgY29uc3QKICAgICByZXR1cm4gZGF0YWJhc2VPcmlnaW5z OwogfQogCi1WZWN0b3I8TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpPcmlnaW5EZXRhaWxz PiBMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6Om9yaWdpbkRldGFpbHMoKQorVmVjdG9yPExv Y2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6T3JpZ2luRGV0YWlscz4gTG9jYWxTdG9yYWdlRGF0 YWJhc2VUcmFja2VyOjpvcmlnaW5EZXRhaWxzSXNvbGF0ZWRDb3B5KCkKIHsKICAgICBWZWN0b3I8 T3JpZ2luRGV0YWlscz4gcmVzdWx0OwogICAgIGF1dG8gZGF0YWJhc2VPcmlnaW5zID0gb3JpZ2lu cygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdl L0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9XZWJTdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5oCmluZGV4IDJhZGJl MWNkYzFhMzQ0OGU5NjZhMTdlNTBlOTYyNTkzMzBhZjVhM2QuLmVhOWZlMTI1YTY4ZjZkZWRkMWIx ZmIzNjA3MjgzMWFmYjY5ZjdkZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvV2ViU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VU cmFja2VyLmgKQEAgLTU5LDcgKzU5LDcgQEAgcHVibGljOgogICAgICAgICB0ZW1wbGF0ZTxjbGFz cyBFbmNvZGVyPiB2b2lkIGVuY29kZShFbmNvZGVyJikgY29uc3Q7CiAgICAgICAgIHRlbXBsYXRl PGNsYXNzIERlY29kZXI+IHN0YXRpYyBPcHRpb25hbDxPcmlnaW5EZXRhaWxzPiBkZWNvZGUoRGVj b2RlciYpOwogICAgIH07Ci0gICAgVmVjdG9yPE9yaWdpbkRldGFpbHM+IG9yaWdpbkRldGFpbHMo KTsKKyAgICBWZWN0b3I8T3JpZ2luRGV0YWlscz4gb3JpZ2luRGV0YWlsc0lzb2xhdGVkQ29weSgp OwogCiBwcml2YXRlOgogICAgIExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcihSZWY8V29ya1F1 ZXVlPiYmLCBjb25zdCBTdHJpbmcmIGxvY2FsU3RvcmFnZURpcmVjdG9yeSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIu Y3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdlL1N0b3JhZ2VNYW5h Z2VyLmNwcAppbmRleCA1MGZkZTkwZDYxNWVkNTg4OTYwMTVjNjlhMmIwOTE1MmZkMmZiMjdiLi42 ZThjMmVhYjI1ZDM4NTc3ZWExY2Q4YWJkYTlmNWFmYTg1OGQ4YzgwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9TdG9yYWdlTWFuYWdl ci5jcHAKQEAgLTYzOSwxMyArNjM5LDcgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlU2Vz c2lvblN0b3JhZ2VPcmlnaW5zKEZ1bmN0aW9uPHZvaWQoKT4mJiBjb21wbGV0aW9uSGEKIAogdm9p ZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlU2Vzc2lvblN0b3JhZ2VFbnRyaWVzRm9yT3JpZ2lucyhj b25zdCBWZWN0b3I8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhPiYgb3JpZ2lucywgRnVuY3Rp b248dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIFZlY3RvcjxXZWJDb3JlOjpT ZWN1cml0eU9yaWdpbkRhdGE+IGNvcGllZE9yaWdpbnM7Ci0gICAgY29waWVkT3JpZ2lucy5yZXNl cnZlSW5pdGlhbENhcGFjaXR5KG9yaWdpbnMuc2l6ZSgpKTsKLQotICAgIGZvciAoYXV0byYgb3Jp Z2luIDogb3JpZ2lucykKLSAgICAgICAgY29waWVkT3JpZ2lucy51bmNoZWNrZWRBcHBlbmQob3Jp Z2luLmlzb2xhdGVkQ29weSgpKTsKLQotICAgIG1fcXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90 ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGNvcGllZE9yaWdpbnMgPSBXVEZNb3ZlKGNvcGll ZE9yaWdpbnMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp XSgpIG11dGFibGUgeworICAgIG1fcXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlz ID0gbWFrZVJlZigqdGhpcyksIGNvcGllZE9yaWdpbnMgPSBjcm9zc1RocmVhZENvcHkob3JpZ2lu cyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0 YWJsZSB7CiAgICAgICAgIGZvciAoYXV0byYgb3JpZ2luIDogY29waWVkT3JpZ2lucykgewogICAg ICAgICAgICAgZm9yIChhdXRvJiBzZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSA6IG1fc2Vzc2lvblN0 b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKQogICAgICAgICAgICAgICAgIHNlc3Npb25TdG9yYWdl TmFtZXNwYWNlLT5jbGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2luKG9yaWdpbik7CkBAIC02 NjIsMTggKzY1NiwxOCBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpnZXRMb2NhbFN0b3JhZ2VPcmln aW5zKEZ1bmN0aW9uPHZvaWQoSGFzaFNldDxXZWJDb3JlOjpTZWN1cgogCiAgICAgICAgIGlmICht X2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcikgewogICAgICAgICAgICAgZm9yIChhdXRvJiBv cmlnaW4gOiBtX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+b3JpZ2lucygpKQotICAgICAg ICAgICAgICAgIG9yaWdpbnMuYWRkKG9yaWdpbik7CisgICAgICAgICAgICAgICAgb3JpZ2lucy5h ZGQob3JpZ2luLmlzb2xhdGVkQ29weSgpKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg IHN0ZDo6bG9ja19ndWFyZDxMb2NrPiBsb2NrKG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlc011dGV4 KTsKICAgICAgICAgICAgIGZvciAoY29uc3QgYXV0byYgbG9jYWxTdG9yYWdlTmFtZVNwYWNlIDog bV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKSB7CiAgICAgICAgICAgICAgICAgZm9y IChhdXRvJiBvcmlnaW4gOiBsb2NhbFN0b3JhZ2VOYW1lU3BhY2UtPmVwaGVtZXJhbE9yaWdpbnMo KSkKLSAgICAgICAgICAgICAgICAgICAgb3JpZ2lucy5hZGQob3JpZ2luKTsKKyAgICAgICAgICAg ICAgICAgICAgb3JpZ2lucy5hZGQob3JpZ2luLmlzb2xhdGVkQ29weSgpKTsKICAgICAgICAgICAg IH0KICAgICAgICAgfQogCiAgICAgICAgIGZvciAoYXV0byYgdHJhbnNpZW50TG9jYWxTdG9yYWdl TmFtZXNwYWNlIDogbV90cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKSB7 CiAgICAgICAgICAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IHRyYW5zaWVudExvY2FsU3RvcmFnZU5h bWVzcGFjZS0+b3JpZ2lucygpKQotICAgICAgICAgICAgICAgIG9yaWdpbnMuYWRkKG9yaWdpbik7 CisgICAgICAgICAgICAgICAgb3JpZ2lucy5hZGQob3JpZ2luLmlzb2xhdGVkQ29weSgpKTsKICAg ICAgICAgfQogCiAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbb3JpZ2lucyA9IFdU Rk1vdmUob3JpZ2lucyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFu ZGxlcildKCkgbXV0YWJsZSB7CkBAIC02ODcsNyArNjgxLDcgQEAgdm9pZCBTdG9yYWdlTWFuYWdl cjo6Z2V0TG9jYWxTdG9yYWdlT3JpZ2luRGV0YWlscyhGdW5jdGlvbjx2b2lkKFZlY3RvcjxMb2Nh bFN0b3IKICAgICBtX3F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VS ZWYoKnRoaXMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp XSgpIG11dGFibGUgewogICAgICAgICBWZWN0b3I8TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2Vy OjpPcmlnaW5EZXRhaWxzPiBvcmlnaW5EZXRhaWxzOwogICAgICAgICBpZiAobV9sb2NhbFN0b3Jh Z2VEYXRhYmFzZVRyYWNrZXIpCi0gICAgICAgICAgICBvcmlnaW5EZXRhaWxzID0gbV9sb2NhbFN0 b3JhZ2VEYXRhYmFzZVRyYWNrZXItPm9yaWdpbkRldGFpbHMoKTsKKyAgICAgICAgICAgIG9yaWdp bkRldGFpbHMgPSBtX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+b3JpZ2luRGV0YWlsc0lz b2xhdGVkQ29weSgpOwogCiAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbb3JpZ2lu RGV0YWlscyA9IFdURk1vdmUob3JpZ2luRGV0YWlscyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RG TW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICBjb21wbGV0 aW9uSGFuZGxlcihXVEZNb3ZlKG9yaWdpbkRldGFpbHMpKTsKQEAgLTc0MiwxMyArNzM2LDcgQEAg dm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlT3JpZ2luc01vZGlmaWVkU2lu Y2UoV2FsbFRpbWUgdGltZSwgRnVuY3QKIAogdm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9j YWxTdG9yYWdlRW50cmllc0Zvck9yaWdpbnMoY29uc3QgVmVjdG9yPFdlYkNvcmU6OlNlY3VyaXR5 T3JpZ2luRGF0YT4mIG9yaWdpbnMsIEZ1bmN0aW9uPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxl cikKIHsKLSAgICBWZWN0b3I8U2VjdXJpdHlPcmlnaW5EYXRhPiBjb3BpZWRPcmlnaW5zOwotICAg IGNvcGllZE9yaWdpbnMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShvcmlnaW5zLnNpemUoKSk7Ci0K LSAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IG9yaWdpbnMpCi0gICAgICAgIGNvcGllZE9yaWdpbnMu dW5jaGVja2VkQXBwZW5kKG9yaWdpbi5pc29sYXRlZENvcHkoKSk7Ci0KLSAgICBtX3F1ZXVlLT5k aXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBjb3BpZWRPcmln aW5zID0gV1RGTW92ZShjb3BpZWRPcmlnaW5zKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKKyAgICBtX3F1ZXVlLT5kaXNwYXRjaChb dGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBjb3BpZWRPcmlnaW5zID0gY3Jv c3NUaHJlYWRDb3B5KG9yaWdpbnMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxl dGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewogICAgICAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IGNv cGllZE9yaWdpbnMpIHsKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBzdGQ6OmxvY2tf Z3VhcmQ8TG9jaz4gbG9jayhtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXNNdXRleCk7Cg== 373367 2019-07-02 15:46:39 -0700 2019-07-02 16:58:36 -0700 Patch bug-199423-20190702154639.patch text/plain 7220 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDhkZWNhOGUwMzUyMTkwYzVl NWUyZjUwMGZiNzcyYzFjNzAxYTFhYjYuLmNiN2VmMWJlOThhOTY5YzMwZDQ0YzIyNGMxYTg1MTFm M2YxODgwMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDctMDIgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSB0byBjcm9zcy10 aHJlYWQgY29weSBpbiBTdG9yYWdlTWFuYWdlciB3aGVuIGhvcHBpbmcgYmFjayB0byB0aGUgbWFp biB0aHJlYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5OTQyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE1ha2Ugc3VyZSB0byBpc29sYXRlIGNvcHkgc29tZSBzdHJpbmdzIHRoYXQgbWF5IG5vdCBiZSBp c29sYXRlZCBpbiBjYXNlIG9mIGVwaGVtZXJhbCBzZXNzaW9ucy4KKyAgICAgICAgUmVuYW1lIG9y aWdpbkRldGFpbHMgdG8gb3JpZ2luRGV0YWlsc0lzb2xhdGVkQ29weSB0byBjbGFyaWZ5IHRoZSBz dHJpbmdzIGFyZSBpc29sYXRlZC4KKyAgICAgICAgU21hbGwgcmVmYWN0b3JpbmcgdG8gdXNlIGNy b3NzVGhyZWFkQ29weSBpbnN0ZWFkIG9mIGRvaW5nIHZlY3RvciBjb3B5IG91cnNlbHZlcy4KKwor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VU cmFja2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2Vy OjpvcmlnaW5EZXRhaWxzSXNvbGF0ZWRDb3B5KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9X ZWJTdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5oOgorICAgICAgICAqIE5ldHdv cmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0 OjpTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlU2Vzc2lvblN0b3JhZ2VFbnRyaWVzRm9yT3JpZ2lucyk6 CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpnZXRMb2NhbFN0b3JhZ2VPcmlnaW5z KToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmdldExvY2FsU3RvcmFnZU9yaWdp bkRldGFpbHMpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxT dG9yYWdlRW50cmllc0Zvck9yaWdpbnMpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1dlYlN0 b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaDoKKwogMjAxOS0wNy0wMiAgVGltIEhvcnRvbiAgPHRpbW90 aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjQzMjQwKTogVW5h YmxlIHRvIHN3aXBlIGJhY2sgaW4gU2FmYXJpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmNwcCBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRh YmFzZVRyYWNrZXIuY3BwCmluZGV4IDg4OTg3YTQ1Y2Q0ZmI5YzJjYmYxZjA0ZDhhMmUwMDg1ZDA1 MmUwMTAuLjEzOWQ3NThjMDA3YTkzYjlmMjU4YjNjMGZmNWI4Y2YzN2Q1YWU4ZDUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9Mb2NhbFN0b3JhZ2VE YXRhYmFzZVRyYWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2Vi U3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwCkBAIC0xMjksNyArMTI5LDcg QEAgVmVjdG9yPFNlY3VyaXR5T3JpZ2luRGF0YT4gTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2Vy OjpvcmlnaW5zKCkgY29uc3QKICAgICByZXR1cm4gZGF0YWJhc2VPcmlnaW5zOwogfQogCi1WZWN0 b3I8TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpPcmlnaW5EZXRhaWxzPiBMb2NhbFN0b3Jh Z2VEYXRhYmFzZVRyYWNrZXI6Om9yaWdpbkRldGFpbHMoKQorVmVjdG9yPExvY2FsU3RvcmFnZURh dGFiYXNlVHJhY2tlcjo6T3JpZ2luRGV0YWlscz4gTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2Vy OjpvcmlnaW5EZXRhaWxzSXNvbGF0ZWRDb3B5KCkKIHsKICAgICBWZWN0b3I8T3JpZ2luRGV0YWls cz4gcmVzdWx0OwogICAgIGF1dG8gZGF0YWJhc2VPcmlnaW5zID0gb3JpZ2lucygpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdlL0xvY2FsU3RvcmFn ZURhdGFiYXNlVHJhY2tlci5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9y YWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5oCmluZGV4IDJhZGJlMWNkYzFhMzQ0OGU5 NjZhMTdlNTBlOTYyNTkzMzBhZjVhM2QuLmVhOWZlMTI1YTY4ZjZkZWRkMWIxZmIzNjA3MjgzMWFm YjY5ZjdkZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3Rv cmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmgKQEAg LTU5LDcgKzU5LDcgQEAgcHVibGljOgogICAgICAgICB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiB2 b2lkIGVuY29kZShFbmNvZGVyJikgY29uc3Q7CiAgICAgICAgIHRlbXBsYXRlPGNsYXNzIERlY29k ZXI+IHN0YXRpYyBPcHRpb25hbDxPcmlnaW5EZXRhaWxzPiBkZWNvZGUoRGVjb2RlciYpOwogICAg IH07Ci0gICAgVmVjdG9yPE9yaWdpbkRldGFpbHM+IG9yaWdpbkRldGFpbHMoKTsKKyAgICBWZWN0 b3I8T3JpZ2luRGV0YWlscz4gb3JpZ2luRGV0YWlsc0lzb2xhdGVkQ29weSgpOwogCiBwcml2YXRl OgogICAgIExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcihSZWY8V29ya1F1ZXVlPiYmLCBjb25z dCBTdHJpbmcmIGxvY2FsU3RvcmFnZURpcmVjdG9yeSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAppbmRl eCA3NmMwZmU1MzkyOGUzNzc4NzdiMTVhMTFiMGMwY2U5MjlmNTgzM2ViLi5kZjBkYmE5YjE3Nzlj NGI4MTNmYTlkOGZmYmIzY2M5M2Y5NTA4ZWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKQEAgLTYy MSwxMyArNjIxLDcgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlU2Vzc2lvblN0b3JhZ2VP cmlnaW5zKEZ1bmN0aW9uPHZvaWQoKT4mJiBjb21wbGV0aW9uSGEKIAogdm9pZCBTdG9yYWdlTWFu YWdlcjo6ZGVsZXRlU2Vzc2lvblN0b3JhZ2VFbnRyaWVzRm9yT3JpZ2lucyhjb25zdCBWZWN0b3I8 V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhPiYgb3JpZ2lucywgRnVuY3Rpb248dm9pZCgpPiYm IGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIFZlY3RvcjxXZWJDb3JlOjpTZWN1cml0eU9yaWdp bkRhdGE+IGNvcGllZE9yaWdpbnM7Ci0gICAgY29waWVkT3JpZ2lucy5yZXNlcnZlSW5pdGlhbENh cGFjaXR5KG9yaWdpbnMuc2l6ZSgpKTsKLQotICAgIGZvciAoYXV0byYgb3JpZ2luIDogb3JpZ2lu cykKLSAgICAgICAgY29waWVkT3JpZ2lucy51bmNoZWNrZWRBcHBlbmQob3JpZ2luLmlzb2xhdGVk Q29weSgpKTsKLQotICAgIG1fcXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0g bWFrZVJlZigqdGhpcyksIGNvcGllZE9yaWdpbnMgPSBXVEZNb3ZlKGNvcGllZE9yaWdpbnMpLCBj b21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUg eworICAgIG1fcXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigq dGhpcyksIGNvcGllZE9yaWdpbnMgPSBjcm9zc1RocmVhZENvcHkob3JpZ2lucyksIGNvbXBsZXRp b25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CiAgICAg ICAgIGZvciAoYXV0byYgb3JpZ2luIDogY29waWVkT3JpZ2lucykgewogICAgICAgICAgICAgZm9y IChhdXRvJiBzZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSA6IG1fc2Vzc2lvblN0b3JhZ2VOYW1lc3Bh Y2VzLnZhbHVlcygpKQogICAgICAgICAgICAgICAgIHNlc3Npb25TdG9yYWdlTmFtZXNwYWNlLT5j bGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2luKG9yaWdpbik7CkBAIC02NDQsMTcgKzYzOCwx NyBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpnZXRMb2NhbFN0b3JhZ2VPcmlnaW5zKEZ1bmN0aW9u PHZvaWQoSGFzaFNldDxXZWJDb3JlOjpTZWN1cgogCiAgICAgICAgIGlmIChtX2xvY2FsU3RvcmFn ZURhdGFiYXNlVHJhY2tlcikgewogICAgICAgICAgICAgZm9yIChhdXRvJiBvcmlnaW4gOiBtX2xv Y2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+b3JpZ2lucygpKQotICAgICAgICAgICAgICAgIG9y aWdpbnMuYWRkKG9yaWdpbik7CisgICAgICAgICAgICAgICAgb3JpZ2lucy5hZGQob3JpZ2luLmlz b2xhdGVkQ29weSgpKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGZvciAoY29uc3Qg YXV0byYgbG9jYWxTdG9yYWdlTmFtZVNwYWNlIDogbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnZh bHVlcygpKSB7CiAgICAgICAgICAgICAgICAgZm9yIChhdXRvJiBvcmlnaW4gOiBsb2NhbFN0b3Jh Z2VOYW1lU3BhY2UtPmVwaGVtZXJhbE9yaWdpbnMoKSkKLSAgICAgICAgICAgICAgICAgICAgb3Jp Z2lucy5hZGQob3JpZ2luKTsKKyAgICAgICAgICAgICAgICAgICAgb3JpZ2lucy5hZGQob3JpZ2lu Lmlzb2xhdGVkQ29weSgpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIGZv ciAoYXV0byYgdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlIDogbV90cmFuc2llbnRMb2Nh bFN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKSB7CiAgICAgICAgICAgICBmb3IgKGF1dG8mIG9y aWdpbiA6IHRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZS0+b3JpZ2lucygpKQotICAgICAg ICAgICAgICAgIG9yaWdpbnMuYWRkKG9yaWdpbik7CisgICAgICAgICAgICAgICAgb3JpZ2lucy5h ZGQob3JpZ2luLmlzb2xhdGVkQ29weSgpKTsKICAgICAgICAgfQogCiAgICAgICAgIFJ1bkxvb3A6 Om1haW4oKS5kaXNwYXRjaChbb3JpZ2lucyA9IFdURk1vdmUob3JpZ2lucyksIGNvbXBsZXRpb25I YW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CkBAIC02Njgs NyArNjYyLDcgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6Z2V0TG9jYWxTdG9yYWdlT3JpZ2luRGV0 YWlscyhGdW5jdGlvbjx2b2lkKFZlY3RvcjxMb2NhbFN0b3IKICAgICBtX3F1ZXVlLT5kaXNwYXRj aChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBjb21wbGV0aW9uSGFuZGxl ciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewogICAgICAgICBWZWN0 b3I8TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpPcmlnaW5EZXRhaWxzPiBvcmlnaW5EZXRh aWxzOwogICAgICAgICBpZiAobV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIpCi0gICAgICAg ICAgICBvcmlnaW5EZXRhaWxzID0gbV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXItPm9yaWdp bkRldGFpbHMoKTsKKyAgICAgICAgICAgIG9yaWdpbkRldGFpbHMgPSBtX2xvY2FsU3RvcmFnZURh dGFiYXNlVHJhY2tlci0+b3JpZ2luRGV0YWlsc0lzb2xhdGVkQ29weSgpOwogCiAgICAgICAgIFJ1 bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbb3JpZ2luRGV0YWlscyA9IFdURk1vdmUob3JpZ2luRGV0 YWlscyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkg bXV0YWJsZSB7CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKG9yaWdpbkRl dGFpbHMpKTsKQEAgLTcxNiwxMyArNzEwLDcgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRl TG9jYWxTdG9yYWdlT3JpZ2luc01vZGlmaWVkU2luY2UoV2FsbFRpbWUgdGltZSwgRnVuY3QKIAog dm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlRW50cmllc0Zvck9yaWdpbnMo Y29uc3QgVmVjdG9yPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YT4mIG9yaWdpbnMsIEZ1bmN0 aW9uPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICBWZWN0b3I8U2VjdXJpdHlP cmlnaW5EYXRhPiBjb3BpZWRPcmlnaW5zOwotICAgIGNvcGllZE9yaWdpbnMucmVzZXJ2ZUluaXRp YWxDYXBhY2l0eShvcmlnaW5zLnNpemUoKSk7Ci0KLSAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IG9y aWdpbnMpCi0gICAgICAgIGNvcGllZE9yaWdpbnMudW5jaGVja2VkQXBwZW5kKG9yaWdpbi5pc29s YXRlZENvcHkoKSk7Ci0KLSAgICBtX3F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhp cyA9IG1ha2VSZWYoKnRoaXMpLCBjb3BpZWRPcmlnaW5zID0gV1RGTW92ZShjb3BpZWRPcmlnaW5z KSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRh YmxlIHsKKyAgICBtX3F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VS ZWYoKnRoaXMpLCBjb3BpZWRPcmlnaW5zID0gY3Jvc3NUaHJlYWRDb3B5KG9yaWdpbnMpLCBjb21w bGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewog ICAgICAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IGNvcGllZE9yaWdpbnMpIHsKICAgICAgICAgICAg IGZvciAoYXV0byYgbG9jYWxTdG9yYWdlTmFtZXNwYWNlIDogbV9sb2NhbFN0b3JhZ2VOYW1lc3Bh Y2VzLnZhbHVlcygpKQogICAgICAgICAgICAgICAgIGxvY2FsU3RvcmFnZU5hbWVzcGFjZS0+Y2xl YXJTdG9yYWdlQXJlYXNNYXRjaGluZ09yaWdpbihvcmlnaW4pOwo= 373372 2019-07-02 16:58:37 -0700 2019-07-03 10:28:59 -0700 Patch bug-199423-20190702165837.patch text/plain 6163 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDhkZWNhOGUwMzUyMTkwYzVl NWUyZjUwMGZiNzcyYzFjNzAxYTFhYjYuLmQ5NzU1OTAzOTNkZTQ0YmZiNDk5OTJkMTE4NzlhZDA3 OTBlYzJjZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTktMDctMDIgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSB0byBjcm9zcy10 aHJlYWQgY29weSBpbiBTdG9yYWdlTWFuYWdlciB3aGVuIGhvcHBpbmcgYmFjayB0byB0aGUgbWFp biB0aHJlYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5OTQyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE1ha2Ugc3VyZSB0byBpc29sYXRlIGNvcHkgc29tZSBzdHJpbmdzIHRoYXQgbWF5IG5vdCBiZSBp c29sYXRlZCBpbiBjYXNlIG9mIGVwaGVtZXJhbCBzZXNzaW9ucy4KKyAgICAgICAgU21hbGwgcmVm YWN0b3JpbmcgdG8gdXNlIGNyb3NzVGhyZWFkQ29weSBpbnN0ZWFkIG9mIGRvaW5nIHZlY3RvciBj b3B5IG91cnNlbHZlcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvTG9j YWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmg6CisgICAgICAgIChXZWJLaXQ6OkxvY2FsU3RvcmFn ZURhdGFiYXNlVHJhY2tlcjo6T3JpZ2luRGV0YWlsczo6aXNvbGF0ZWRDb3B5IGNvbnN0KToKKyAg ICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmRlbGV0ZVNlc3Npb25TdG9yYWdlRW50cmll c0Zvck9yaWdpbnMpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6Z2V0TG9jYWxT dG9yYWdlT3JpZ2lucyk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpnZXRMb2Nh bFN0b3JhZ2VPcmlnaW5EZXRhaWxzKToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6 OmRlbGV0ZUxvY2FsU3RvcmFnZUVudHJpZXNGb3JPcmlnaW5zKToKKwogMjAxOS0wNy0wMiAgVGlt IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9O IChyMjQzMjQwKTogVW5hYmxlIHRvIHN3aXBlIGJhY2sgaW4gU2FmYXJpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJh c2VUcmFja2VyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvTG9j YWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmgKaW5kZXggMmFkYmUxY2RjMWEzNDQ4ZTk2NmExN2U1 MGU5NjI1OTMzMGFmNWEzZC4uNzJiOTNjMzIyNzdkMDdlN2NjODNiMzM1YTczMmJjZjE3ODVlN2Fm OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdlL0xv Y2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvV2ViU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuaApAQCAtNTgsNiAr NTgsOCBAQCBwdWJsaWM6CiAKICAgICAgICAgdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4gdm9pZCBl bmNvZGUoRW5jb2RlciYpIGNvbnN0OwogICAgICAgICB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBz dGF0aWMgT3B0aW9uYWw8T3JpZ2luRGV0YWlscz4gZGVjb2RlKERlY29kZXImKTsKKworICAgICAg ICBPcmlnaW5EZXRhaWxzIGlzb2xhdGVkQ29weSgpIGNvbnN0IHsgcmV0dXJuIHsgb3JpZ2luSWRl bnRpZmllci5pc29sYXRlZENvcHkoKSwgY3JlYXRpb25UaW1lLCBtb2RpZmljYXRpb25UaW1lIH07 IH0KICAgICB9OwogICAgIFZlY3RvcjxPcmlnaW5EZXRhaWxzPiBvcmlnaW5EZXRhaWxzKCk7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9TdG9y YWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2Uv U3RvcmFnZU1hbmFnZXIuY3BwCmluZGV4IDc2YzBmZTUzOTI4ZTM3Nzg3N2IxNWExMWIwYzBjZTky OWY1ODMzZWIuLjU5Zjc0OWE3NTNhYjJlMzY3OGQwYWUyODQ1NzI3ODdmMTgwMzAyZjMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9TdG9yYWdlTWFu YWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdlL1N0 b3JhZ2VNYW5hZ2VyLmNwcApAQCAtNjIxLDEzICs2MjEsNyBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2Vy OjpkZWxldGVTZXNzaW9uU3RvcmFnZU9yaWdpbnMoRnVuY3Rpb248dm9pZCgpPiYmIGNvbXBsZXRp b25IYQogCiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVTZXNzaW9uU3RvcmFnZUVudHJpZXNG b3JPcmlnaW5zKGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGE+JiBvcmln aW5zLCBGdW5jdGlvbjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgVmVjdG9y PFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YT4gY29waWVkT3JpZ2luczsKLSAgICBjb3BpZWRP cmlnaW5zLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkob3JpZ2lucy5zaXplKCkpOwotCi0gICAgZm9y IChhdXRvJiBvcmlnaW4gOiBvcmlnaW5zKQotICAgICAgICBjb3BpZWRPcmlnaW5zLnVuY2hlY2tl ZEFwcGVuZChvcmlnaW4uaXNvbGF0ZWRDb3B5KCkpOwotCi0gICAgbV9xdWV1ZS0+ZGlzcGF0Y2go W3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY29waWVkT3JpZ2lucyA9IFdU Rk1vdmUoY29waWVkT3JpZ2lucyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0 aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CisgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHBy b3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY29waWVkT3JpZ2lucyA9IGNyb3NzVGhyZWFk Q29weShvcmlnaW5zKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKV0oKSBtdXRhYmxlIHsKICAgICAgICAgZm9yIChhdXRvJiBvcmlnaW4gOiBjb3BpZWRPcmln aW5zKSB7CiAgICAgICAgICAgICBmb3IgKGF1dG8mIHNlc3Npb25TdG9yYWdlTmFtZXNwYWNlIDog bV9zZXNzaW9uU3RvcmFnZU5hbWVzcGFjZXMudmFsdWVzKCkpCiAgICAgICAgICAgICAgICAgc2Vz c2lvblN0b3JhZ2VOYW1lc3BhY2UtPmNsZWFyU3RvcmFnZUFyZWFzTWF0Y2hpbmdPcmlnaW4ob3Jp Z2luKTsKQEAgLTY0NCwxNyArNjM4LDE3IEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmdldExvY2Fs U3RvcmFnZU9yaWdpbnMoRnVuY3Rpb248dm9pZChIYXNoU2V0PFdlYkNvcmU6OlNlY3VyCiAKICAg ICAgICAgaWYgKG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyKSB7CiAgICAgICAgICAgICBm b3IgKGF1dG8mIG9yaWdpbiA6IG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLT5vcmlnaW5z KCkpCi0gICAgICAgICAgICAgICAgb3JpZ2lucy5hZGQob3JpZ2luKTsKKyAgICAgICAgICAgICAg ICBvcmlnaW5zLmFkZChvcmlnaW4uaXNvbGF0ZWRDb3B5KCkpOwogICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgZm9yIChjb25zdCBhdXRvJiBsb2NhbFN0b3JhZ2VOYW1lU3BhY2UgOiBtX2xv Y2FsU3RvcmFnZU5hbWVzcGFjZXMudmFsdWVzKCkpIHsKICAgICAgICAgICAgICAgICBmb3IgKGF1 dG8mIG9yaWdpbiA6IGxvY2FsU3RvcmFnZU5hbWVTcGFjZS0+ZXBoZW1lcmFsT3JpZ2lucygpKQot ICAgICAgICAgICAgICAgICAgICBvcmlnaW5zLmFkZChvcmlnaW4pOworICAgICAgICAgICAgICAg ICAgICBvcmlnaW5zLmFkZChvcmlnaW4uaXNvbGF0ZWRDb3B5KCkpOwogICAgICAgICAgICAgfQog ICAgICAgICB9CiAKICAgICAgICAgZm9yIChhdXRvJiB0cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1l c3BhY2UgOiBtX3RyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZXMudmFsdWVzKCkpIHsKICAg ICAgICAgICAgIGZvciAoYXV0byYgb3JpZ2luIDogdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNw YWNlLT5vcmlnaW5zKCkpCi0gICAgICAgICAgICAgICAgb3JpZ2lucy5hZGQob3JpZ2luKTsKKyAg ICAgICAgICAgICAgICBvcmlnaW5zLmFkZChvcmlnaW4uaXNvbGF0ZWRDb3B5KCkpOwogICAgICAg ICB9CiAKICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtvcmlnaW5zID0gV1RGTW92 ZShvcmlnaW5zKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVy KV0oKSBtdXRhYmxlIHsKQEAgLTY2OCw3ICs2NjIsNyBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpn ZXRMb2NhbFN0b3JhZ2VPcmlnaW5EZXRhaWxzKEZ1bmN0aW9uPHZvaWQoVmVjdG9yPExvY2FsU3Rv cgogICAgIG1fcXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigq dGhpcyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkg bXV0YWJsZSB7CiAgICAgICAgIFZlY3RvcjxMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6Ok9y aWdpbkRldGFpbHM+IG9yaWdpbkRldGFpbHM7CiAgICAgICAgIGlmIChtX2xvY2FsU3RvcmFnZURh dGFiYXNlVHJhY2tlcikKLSAgICAgICAgICAgIG9yaWdpbkRldGFpbHMgPSBtX2xvY2FsU3RvcmFn ZURhdGFiYXNlVHJhY2tlci0+b3JpZ2luRGV0YWlscygpOworICAgICAgICAgICAgb3JpZ2luRGV0 YWlscyA9IG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLT5vcmlnaW5EZXRhaWxzKCkuaXNv bGF0ZWRDb3B5KCk7CiAKICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtvcmlnaW5E ZXRhaWxzID0gV1RGTW92ZShvcmlnaW5EZXRhaWxzKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZN b3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAgICAgICAgICAgIGNvbXBsZXRp b25IYW5kbGVyKFdURk1vdmUob3JpZ2luRGV0YWlscykpOwpAQCAtNzE2LDEzICs3MTAsNyBAQCB2 b2lkIFN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVMb2NhbFN0b3JhZ2VPcmlnaW5zTW9kaWZpZWRTaW5j ZShXYWxsVGltZSB0aW1lLCBGdW5jdAogCiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVMb2Nh bFN0b3JhZ2VFbnRyaWVzRm9yT3JpZ2lucyhjb25zdCBWZWN0b3I8V2ViQ29yZTo6U2VjdXJpdHlP cmlnaW5EYXRhPiYgb3JpZ2lucywgRnVuY3Rpb248dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVy KQogewotICAgIFZlY3RvcjxTZWN1cml0eU9yaWdpbkRhdGE+IGNvcGllZE9yaWdpbnM7Ci0gICAg Y29waWVkT3JpZ2lucy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG9yaWdpbnMuc2l6ZSgpKTsKLQot ICAgIGZvciAoYXV0byYgb3JpZ2luIDogb3JpZ2lucykKLSAgICAgICAgY29waWVkT3JpZ2lucy51 bmNoZWNrZWRBcHBlbmQob3JpZ2luLmlzb2xhdGVkQ29weSgpKTsKLQotICAgIG1fcXVldWUtPmRp c3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGNvcGllZE9yaWdp bnMgPSBXVEZNb3ZlKGNvcGllZE9yaWdpbnMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUo Y29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgeworICAgIG1fcXVldWUtPmRpc3BhdGNoKFt0 aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGNvcGllZE9yaWdpbnMgPSBjcm9z c1RocmVhZENvcHkob3JpZ2lucyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0 aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CiAgICAgICAgIGZvciAoYXV0byYgb3JpZ2luIDogY29w aWVkT3JpZ2lucykgewogICAgICAgICAgICAgZm9yIChhdXRvJiBsb2NhbFN0b3JhZ2VOYW1lc3Bh Y2UgOiBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMudmFsdWVzKCkpCiAgICAgICAgICAgICAgICAg bG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5jbGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2luKG9y aWdpbik7Cg==