188025 2018-07-25 15:30:30 -0700 Allow ActiveDOMObject's canSuspend / suspend / resume overrides to destroy ActiveDOMObjects 2018-07-27 08:59:50 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 187284 1 cdumez cdumez achristensen beidson commit-queue dbates eric.carlson esprehn+autocc ews-watchlist ggaren kangil.han rniwa webkit-bug-importer oldest_to_newest 1445193 0 cdumez 2018-07-25 15:30:30 -0700 Allow ActiveDOMObject's canSuspend / suspend / resume overrides to destroy ActiveDOMObjects. There is a good reason to prevent construction of new ActiveDOMObjects from these overrides as this would cause break PageCache logic. However, it is fine for these overrides to destroy existing ActiveDOMObjects as long as we make our code iterating over ActiveDOMObjects support it. 1445194 1 345794 cdumez 2018-07-25 15:38:00 -0700 Created attachment 345794 Patch 1445208 2 345798 cdumez 2018-07-25 16:21:25 -0700 Created attachment 345798 Patch 1445247 3 345798 commit-queue 2018-07-25 17:34:24 -0700 Comment on attachment 345798 Patch Rejecting attachment 345798 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 345798, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=345798&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=188025&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 345798 from bug 188025. Fetching: https://bugs.webkit.org/attachment.cgi?id=345798 Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebCore/ChangeLog ERROR from SVN: Item is out of date: File '/trunk/Source/WebCore/ChangeLog' is out of date W: 98375d5bde7b8b5deb2161c8170939887189f626 and refs/remotes/origin/master differ, using rebase: :040000 040000 c5a29e897de220921e005b5172e9e434ec122c72 09b5c312726605cb3511c4872bb8e2b3b16ce04d M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebCore/ChangeLog ERROR from SVN: Item is out of date: File '/trunk/Source/WebCore/ChangeLog' is out of date W: 98375d5bde7b8b5deb2161c8170939887189f626 and refs/remotes/origin/master differ, using rebase: :040000 040000 c5a29e897de220921e005b5172e9e434ec122c72 09b5c312726605cb3511c4872bb8e2b3b16ce04d M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource From https://git.webkit.org/git/WebKit 49e70b34d9f..d294af02a32 master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 234219 = 49e70b34d9fd9d0b75ac25fc2aafd34a8f6fd3b6 r234220 = 9c74f145f3f5375c8d17382ddaa69790c6b7b259 r234222 = c3452943748c48453648405a5de829db87d9a580 r234223 = d294af02a323a020fb8a1f7d16c748d30047c272 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: https://webkit-queues.webkit.org/results/8656037 1445260 4 345798 commit-queue 2018-07-25 18:29:17 -0700 Comment on attachment 345798 Patch Clearing flags on attachment: 345798 Committed r234226: <https://trac.webkit.org/changeset/234226> 1445261 5 commit-queue 2018-07-25 18:29:19 -0700 All reviewed patches have been landed. Closing bug. 1445271 6 webkit-bug-importer 2018-07-25 19:23:58 -0700 <rdar://problem/42608604> 345794 2018-07-25 15:38:00 -0700 2018-07-25 16:21:23 -0700 Patch bug-188025-20180725153759.patch text/plain 10744 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MjEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODUwMDllYWJjYzczNmM0 ZWM5MDBhNWQ2YTlkY2RmMzgxOTNiOTE2Yy4uMGVkMWI4NWExMjUyZGZkNWUyMDNiYzEwODJhYmI3 NmE4ZDZhYmNlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE4LTA3LTI1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQWxsb3cgQWN0aXZlRE9NT2Jq ZWN0J3MgY2FuU3VzcGVuZCAvIHN1c3BlbmQgLyByZXN1bWUgb3ZlcnJpZGVzIHRvIGRlc3Ryb3kg QWN0aXZlRE9NT2JqZWN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg4MDI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQXBwbHkgdGhlIHNhbWUgbG9naWMgYXMgaW4gU2NyaXB0RXhlY3V0aW9uQ29udGV4 dDo6c3RvcEFjdGl2ZURPTU9iamVjdHMoKSB0byBzdXBwb3J0IGRlc3RydWN0aW9uIG9mCisgICAg ICAgIEFjdGl2ZURPTU9iamVjdHMgd2hpbGUgd2UncmUgY2FsbGluZyBBY3RpdmVET01PYmplY3Qn cyBjYW5TdXNwZW5kIC8gc3VzcGVuZCAvIHJlc3VtZSBvdmVycmlkZXMuCisKKyAgICAgICAgV2Ug Y29weSBtX2FjdGl2ZURPTU9iamVjdHMgaW50byBhIFZlY3RvciBhbmQgaXRlcmF0ZSBvdmVyIHRo ZSBjb3B5IGluc3RlYWQgb2YgbV9hY3RpdmVET01PYmplY3RzLgorICAgICAgICBTaW5jZSBBY3Rp dmVET01PYmplY3QgaXMgbm90IFJlZkNvdW50ZWQgb3IgQ2FuTWFrZVdlYWtQdHIsIHdlIHZlcmlm eSB0aGF0IHRoZSByYXcgcG9pbnRlciBpcyBzdGlsbAorICAgICAgICB2YWxpZCBieSBjaGVja2lu ZyBpZiBtX2FjdGl2ZURPTU9iamVjdHMgc3RpbGwgY29udGFpbnMgaXQsIGFzIHdlIGl0ZXJhdGUu IFRoaXMgaXMgc2FmZSBhcyB0aGUKKyAgICAgICAgQWN0aXZlRE9NT2JqZWN0IGRlc3RydWN0b3Ig cmVtb3ZlcyB0aGUgb2JqZWN0IGZyb20gU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6bV9hY3RpdmVE T01PYmplY3RzLgorICAgICAgICBOZXcgQWN0aXZlRE9NT2JqZWN0cyB3aXRoIHRoZSBzYW1lIHBv aW50ZXIgdmFsdWUgY2Fubm90IGJlIGNyZWF0ZWQgd2hpbGUgd2UgaXRlcmF0ZSBhcyB3ZSBhbHJl YWR5CisgICAgICAgIHByZXZlbnQgdGhlIGNvbnN0cnVjdGlvbiBvZiBuZXcgQWN0aXZlRE9NT2Jq ZWN0cyB3aGlsZSB3ZSBpdGVyYXRlIHZpYSBSRUxFQVNFX0FTU0VSVCgpLgorCisgICAgICAgICog ZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0 RXhlY3V0aW9uQ29udGV4dDo6Y2FuU3VzcGVuZEFjdGl2ZURPTU9iamVjdHNGb3JEb2N1bWVudFN1 c3BlbnNpb24pOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6Zm9y RWFjaEFjdGl2ZURPTU9iamVjdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRFeGVj dXRpb25Db250ZXh0OjpzdXNwZW5kQWN0aXZlRE9NT2JqZWN0cyk6CisgICAgICAgIChXZWJDb3Jl OjpTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpyZXN1bWVBY3RpdmVET01PYmplY3RzKToKKyAgICAg ICAgKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnN0b3BBY3RpdmVET01PYmplY3Rz KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OndpbGxEZXN0cm95 QWN0aXZlRE9NT2JqZWN0KToKKyAgICAgICAgKiBkb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5o OgorCiAyMDE4LTA3LTI1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgbmF2aWdhdG9yLnVzZXJBZ2VudCBtYXkgcmV0dXJuIG91dGRhdGVkIHZhbHVlIGFmdGVyIHdl YlZpZXcuY3VzdG9tVXNlckFnZW50IGlzIHNldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1Njcmlw dEV4ZWN1dGlvbkNvbnRleHQuY3BwCmluZGV4IDQzOTQ0OTQxZTg2YjU0MjA4MjIwYmU2ZGVmNmZh ZTVmMTcyMzVkOGEuLjFiNjYwZGUwYThkMmE4ZDM3ZGM4YTI1MTQ5ODRjM2ZjZDZkZGUzODAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5jcHAKQEAgLTYx LDYgKzYxLDcgQEAKICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9TdHJvbmdJbmxpbmVzLmg+CiAj aW5jbHVkZSA8d3RmL01haW5UaHJlYWQuaD4KICNpbmNsdWRlIDx3dGYvUmVmLmg+CisjaW5jbHVk ZSA8d3RmL1NldEZvclNjb3BlLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIHVzaW5nIG5hbWVz cGFjZSBJbnNwZWN0b3I7CkBAIC0yMjgsMzAgKzIyOSw1MSBAQCBib29sIFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQ6OmNhblN1c3BlbmRBY3RpdmVET01PYmplY3RzRm9yRG9jdW1lbnRTdXNwZW5zaW9u KFZlYwogCiAgICAgYm9vbCBjYW5TdXNwZW5kID0gdHJ1ZTsKIAotICAgIG1fYWN0aXZlRE9NT2Jq ZWN0QWRkaXRpb25Gb3JiaWRkZW4gPSB0cnVlOwotICAgIG1fYWN0aXZlRE9NT2JqZWN0UmVtb3Zh bEZvcmJpZGRlbiA9IHRydWU7Ci0KLSAgICAvLyBXZSBhc3N1bWUgdGhhdCBtX2FjdGl2ZURPTU9i amVjdHMgd2lsbCBub3QgY2hhbmdlIGR1cmluZyBpdGVyYXRpb246IGNhblN1c3BlbmQKLSAgICAv LyBmdW5jdGlvbnMgc2hvdWxkIG5vdCBhZGQgbmV3IGFjdGl2ZSBET00gb2JqZWN0cywgbm9yIGV4 ZWN1dGUgYXJiaXRyYXJ5IEphdmFTY3JpcHQuCi0gICAgLy8gQW4gQVNTRVJUX1dJVEhfU0VDVVJJ VFlfSU1QTElDQVRJT04gb3IgUkVMRUFTRV9BU1NFUlQgd2lsbCBmaXJlIGlmIHRoaXMgaGFwcGVu cywgYnV0IGl0J3MgaW1wb3J0YW50IHRvIGNvZGUKLSAgICAvLyBjYW5TdXNwZW5kIGZ1bmN0aW9u cyBzbyBpdCB3aWxsIG5vdCBoYXBwZW4hCi0gICAgU2NyaXB0RGlzYWxsb3dlZFNjb3BlOjpJbk1h aW5UaHJlYWQgc2NyaXB0RGlzYWxsb3dlZFNjb3BlOwotICAgIGZvciAoYXV0byogYWN0aXZlRE9N T2JqZWN0IDogbV9hY3RpdmVET01PYmplY3RzKSB7Ci0gICAgICAgIGlmICghYWN0aXZlRE9NT2Jq ZWN0LT5jYW5TdXNwZW5kRm9yRG9jdW1lbnRTdXNwZW5zaW9uKCkpIHsKKyAgICBmb3JFYWNoQWN0 aXZlRE9NT2JqZWN0KFsmXShhdXRvJiBhY3RpdmVET01PYmplY3QpIHsKKyAgICAgICAgaWYgKCFh Y3RpdmVET01PYmplY3QuY2FuU3VzcGVuZEZvckRvY3VtZW50U3VzcGVuc2lvbigpKSB7CiAgICAg ICAgICAgICBjYW5TdXNwZW5kID0gZmFsc2U7CiAgICAgICAgICAgICBpZiAodW5zdXNwZW5kYWJs ZU9iamVjdHMpCi0gICAgICAgICAgICAgICAgdW5zdXNwZW5kYWJsZU9iamVjdHMtPmFwcGVuZChh Y3RpdmVET01PYmplY3QpOworICAgICAgICAgICAgICAgIHVuc3VzcGVuZGFibGVPYmplY3RzLT5h cHBlbmQoJmFjdGl2ZURPTU9iamVjdCk7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgICAgICAgICAgcmV0dXJuIFNob3VsZENvbnRpbnVlOjpObzsKICAg ICAgICAgfQotICAgIH0KKyAgICAgICAgcmV0dXJuIFNob3VsZENvbnRpbnVlOjpZZXM7CisgICAg fSk7CiAKLSAgICBtX2FjdGl2ZURPTU9iamVjdEFkZGl0aW9uRm9yYmlkZGVuID0gZmFsc2U7Ci0g ICAgbV9hY3RpdmVET01PYmplY3RSZW1vdmFsRm9yYmlkZGVuID0gZmFsc2U7CisgICAgaWYgKHVu c3VzcGVuZGFibGVPYmplY3RzKSB7CisgICAgICAgIC8vIFJlbW92ZSBhY3RpdmVET01PYmplY3Rz IHRoYXQgaGF2ZSBiZWVuIGRlc3Ryb3llZCB3aGlsZSB3ZSB3ZXJlIGl0ZXJhdGluZyBhYm92ZS4K KyAgICAgICAgdW5zdXNwZW5kYWJsZU9iamVjdHMtPnJlbW92ZUFsbE1hdGNoaW5nKFsmXShhdXRv KiBhY3RpdmVET01PYmplY3QpIHsKKyAgICAgICAgICAgIHJldHVybiAhbV9hY3RpdmVET01PYmpl Y3RzLmNvbnRhaW5zKGFjdGl2ZURPTU9iamVjdCk7CisgICAgICAgIH0pOworICAgIH0KIAogICAg IHJldHVybiBjYW5TdXNwZW5kOwogfQogCit2b2lkIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OmZv ckVhY2hBY3RpdmVET01PYmplY3QoY29uc3QgRnVuY3Rpb248U2hvdWxkQ29udGludWUoQWN0aXZl RE9NT2JqZWN0Jik+JiBhcHBseSkgY29uc3QKK3sKKyAgICAvLyBJdCBpcyBub3QgYWxsb3dlZCB0 byBydW4gYXJiaXRyYXJ5IHNjcmlwdCBvciBjb25zdHJ1Y3QgbmV3IEFjdGl2ZURPTU9iamVjdHMg d2hpbGUgd2UgYXJlIGl0ZXJhdGluZyBvdmVyIEFjdGl2ZURPTU9iamVjdHMuCisgICAgLy8gQW4g QVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04gb3IgUkVMRUFTRV9BU1NFUlQgd2lsbCBm aXJlIGlmIHRoaXMgaGFwcGVucywgYnV0IGl0J3MgaW1wb3J0YW50IHRvIGNvZGUKKyAgICAvLyBj YW5TdXNwZW5kQWN0aXZlRE9NT2JqZWN0c0ZvckRvY3VtZW50U3VzcGVuc2lvbigpIC8gc3VzcGVu ZCgpIC8gcmVzdW1lKCkgLyBzdG9wKCkgZnVuY3Rpb25zIHNvIGl0IHdpbGwgbm90IGhhcHBlbiEK KyAgICBTY3JpcHREaXNhbGxvd2VkU2NvcGU6OkluTWFpblRocmVhZCBzY3JpcHREaXNhbGxvd2Vk U2NvcGU7CisgICAgU2V0Rm9yU2NvcGU8Ym9vbD4gYWN0aXZlRE9NT2JqZWN0QWRkaXRpb25Gb3Ji aWRkZW5TY29wZShtX2FjdGl2ZURPTU9iamVjdEFkZGl0aW9uRm9yYmlkZGVuLCB0cnVlKTsKKwor ICAgIC8vIE1ha2UgYSBmcm96ZW4gY29weSBvZiB0aGUgb2JqZWN0cyBzbyB3ZSBjYW4gaXRlcmF0 ZSB3aGlsZSBuZXcgb25lcyBtaWdodCBiZSBkZXN0cm95ZWQuCisgICAgYXV0byBwb3NzaWJsZUFj dGl2ZURPTU9iamVjdHMgPSBjb3B5VG9WZWN0b3IobV9hY3RpdmVET01PYmplY3RzKTsKKworICAg IGZvciAoYXV0byogYWN0aXZlRE9NT2JqZWN0IDogcG9zc2libGVBY3RpdmVET01PYmplY3RzKSB7 CisgICAgICAgIC8vIENoZWNrIGlmIHRoaXMgb2JqZWN0IHdhcyBkZWxldGVkIGFscmVhZHkuIElm IHNvLCBqdXN0IHNraXAgaXQuCisgICAgICAgIC8vIENhbGxpbmcgY29udGFpbnMgb24gYSBwb3Nz aWJseS1hbHJlYWR5LWRlbGV0ZWQgb2JqZWN0IGlzIE9LIGJlY2F1c2Ugd2UgZ3VhcmFudGVlCisg ICAgICAgIC8vIG5vIG5ldyBvYmplY3QgY2FuIGJlIGFkZGVkLCBzbyBldmVuIGlmIGEgbmV3IG9i amVjdCBlbmRzIHVwIGFsbG9jYXRlZCB3aXRoIHRoZQorICAgICAgICAvLyBzYW1lIGFkZHJlc3Ms IHRoYXQgd2lsbCBiZSAqYWZ0ZXIqIHRoaXMgZnVuY3Rpb24gZXhpdHMuCisgICAgICAgIGlmICgh bV9hY3RpdmVET01PYmplY3RzLmNvbnRhaW5zKGFjdGl2ZURPTU9iamVjdCkpCisgICAgICAgICAg ICBjb250aW51ZTsKKworICAgICAgICBpZiAoYXBwbHkoKmFjdGl2ZURPTU9iamVjdCkgPT0gU2hv dWxkQ29udGludWU6Ok5vKQorICAgICAgICAgICAgYnJlYWs7CisgICAgfQorfQorCiB2b2lkIFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnN1c3BlbmRBY3RpdmVET01PYmplY3RzKFJlYXNvbkZvclN1 c3BlbnNpb24gd2h5KQogewogICAgIGNoZWNrQ29uc2lzdGVuY3koKTsKQEAgLTI2NiwxOSArMjg4 LDEwIEBAIHZvaWQgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6c3VzcGVuZEFjdGl2ZURPTU9iamVj dHMoUmVhc29uRm9yU3VzcGVuc2lvbiB3aHkpCiAKICAgICBtX2FjdGl2ZURPTU9iamVjdHNBcmVT dXNwZW5kZWQgPSB0cnVlOwogCi0gICAgbV9hY3RpdmVET01PYmplY3RBZGRpdGlvbkZvcmJpZGRl biA9IHRydWU7Ci0gICAgbV9hY3RpdmVET01PYmplY3RSZW1vdmFsRm9yYmlkZGVuID0gdHJ1ZTsK LQotICAgIC8vIFdlIGFzc3VtZSB0aGF0IG1fYWN0aXZlRE9NT2JqZWN0cyB3aWxsIG5vdCBjaGFu Z2UgZHVyaW5nIGl0ZXJhdGlvbjogc3VzcGVuZAotICAgIC8vIGZ1bmN0aW9ucyBzaG91bGQgbm90 IGFkZCBuZXcgYWN0aXZlIERPTSBvYmplY3RzLCBub3IgZXhlY3V0ZSBhcmJpdHJhcnkgSmF2YVNj cmlwdC4KLSAgICAvLyBBbiBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTiBvciBSRUxF QVNFX0FTU0VSVCB3aWxsIGZpcmUgaWYgdGhpcyBoYXBwZW5zLCBidXQgaXQncyBpbXBvcnRhbnQg dG8gY29kZQotICAgIC8vIHN1c3BlbmQgZnVuY3Rpb25zIHNvIGl0IHdpbGwgbm90IGhhcHBlbiEK LSAgICBTY3JpcHREaXNhbGxvd2VkU2NvcGU6OkluTWFpblRocmVhZCBzY3JpcHREaXNhbGxvd2Vk U2NvcGU7Ci0gICAgZm9yIChhdXRvKiBhY3RpdmVET01PYmplY3QgOiBtX2FjdGl2ZURPTU9iamVj dHMpCi0gICAgICAgIGFjdGl2ZURPTU9iamVjdC0+c3VzcGVuZCh3aHkpOwotCi0gICAgbV9hY3Rp dmVET01PYmplY3RBZGRpdGlvbkZvcmJpZGRlbiA9IGZhbHNlOwotICAgIG1fYWN0aXZlRE9NT2Jq ZWN0UmVtb3ZhbEZvcmJpZGRlbiA9IGZhbHNlOworICAgIGZvckVhY2hBY3RpdmVET01PYmplY3Qo W3doeV0oYXV0byYgYWN0aXZlRE9NT2JqZWN0KSB7CisgICAgICAgIGFjdGl2ZURPTU9iamVjdC5z dXNwZW5kKHdoeSk7CisgICAgICAgIHJldHVybiBTaG91bGRDb250aW51ZTo6WWVzOworICAgIH0p OwogCiAgICAgbV9yZWFzb25Gb3JTdXNwZW5kaW5nQWN0aXZlRE9NT2JqZWN0cyA9IHdoeTsKIH0K QEAgLTI5MSwxOSArMzA0LDEwIEBAIHZvaWQgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6cmVzdW1l QWN0aXZlRE9NT2JqZWN0cyhSZWFzb25Gb3JTdXNwZW5zaW9uIHdoeSkKICAgICAgICAgcmV0dXJu OwogICAgIG1fYWN0aXZlRE9NT2JqZWN0c0FyZVN1c3BlbmRlZCA9IGZhbHNlOwogCi0gICAgbV9h Y3RpdmVET01PYmplY3RBZGRpdGlvbkZvcmJpZGRlbiA9IHRydWU7Ci0gICAgbV9hY3RpdmVET01P YmplY3RSZW1vdmFsRm9yYmlkZGVuID0gdHJ1ZTsKLQotICAgIC8vIFdlIGFzc3VtZSB0aGF0IG1f YWN0aXZlRE9NT2JqZWN0cyB3aWxsIG5vdCBjaGFuZ2UgZHVyaW5nIGl0ZXJhdGlvbjogcmVzdW1l Ci0gICAgLy8gZnVuY3Rpb25zIHNob3VsZCBub3QgYWRkIG5ldyBhY3RpdmUgRE9NIG9iamVjdHMs IG5vciBleGVjdXRlIGFyYml0cmFyeSBKYXZhU2NyaXB0LgotICAgIC8vIEFuIEFTU0VSVF9XSVRI X1NFQ1VSSVRZX0lNUExJQ0FUSU9OIG9yIFJFTEVBU0VfQVNTRVJUIHdpbGwgZmlyZSBpZiB0aGlz IGhhcHBlbnMsIGJ1dCBpdCdzIGltcG9ydGFudCB0byBjb2RlCi0gICAgLy8gcmVzdW1lIGZ1bmN0 aW9ucyBzbyBpdCB3aWxsIG5vdCBoYXBwZW4hCi0gICAgU2NyaXB0RGlzYWxsb3dlZFNjb3BlOjpJ bk1haW5UaHJlYWQgc2NyaXB0RGlzYWxsb3dlZFNjb3BlOwotICAgIGZvciAoYXV0byogYWN0aXZl RE9NT2JqZWN0IDogbV9hY3RpdmVET01PYmplY3RzKQotICAgICAgICBhY3RpdmVET01PYmplY3Qt PnJlc3VtZSgpOwotCi0gICAgbV9hY3RpdmVET01PYmplY3RBZGRpdGlvbkZvcmJpZGRlbiA9IGZh bHNlOwotICAgIG1fYWN0aXZlRE9NT2JqZWN0UmVtb3ZhbEZvcmJpZGRlbiA9IGZhbHNlOworICAg IGZvckVhY2hBY3RpdmVET01PYmplY3QoW10oYXV0byYgYWN0aXZlRE9NT2JqZWN0KSB7CisgICAg ICAgIGFjdGl2ZURPTU9iamVjdC5yZXN1bWUoKTsKKyAgICAgICAgcmV0dXJuIFNob3VsZENvbnRp bnVlOjpZZXM7CisgICAgfSk7CiB9CiAKIHZvaWQgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6c3Rv cEFjdGl2ZURPTU9iamVjdHMoKQpAQCAtMzE0LDI3ICszMTgsMTAgQEAgdm9pZCBTY3JpcHRFeGVj dXRpb25Db250ZXh0OjpzdG9wQWN0aXZlRE9NT2JqZWN0cygpCiAgICAgICAgIHJldHVybjsKICAg ICBtX2FjdGl2ZURPTU9iamVjdHNBcmVTdG9wcGVkID0gdHJ1ZTsKIAotICAgIC8vIE1ha2UgYSBm cm96ZW4gY29weSBvZiB0aGUgb2JqZWN0cyBzbyB3ZSBjYW4gaXRlcmF0ZSB3aGlsZSBuZXcgb25l cyBtaWdodCBiZSBkZXN0cm95ZWQuCi0gICAgYXV0byBwb3NzaWJsZUFjdGl2ZURPTU9iamVjdHMg PSBjb3B5VG9WZWN0b3IobV9hY3RpdmVET01PYmplY3RzKTsKLQotICAgIG1fYWN0aXZlRE9NT2Jq ZWN0QWRkaXRpb25Gb3JiaWRkZW4gPSB0cnVlOwotCi0gICAgLy8gV2UgYXNzdW1lIHRoYXQgbmV3 IG9iamVjdHMgd2lsbCBub3QgYmUgYWRkZWQgdG8gbV9hY3RpdmVET01PYmplY3RzIGR1cmluZyBp dGVyYXRpb246Ci0gICAgLy8gc3RvcCBmdW5jdGlvbnMgc2hvdWxkIG5vdCBhZGQgbmV3IGFjdGl2 ZSBET00gb2JqZWN0cywgbm9yIGV4ZWN1dGUgYXJiaXRyYXJ5IEphdmFTY3JpcHQuCi0gICAgLy8g QW4gQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04gb3IgUkVMRUFTRV9BU1NFUlQgd2ls bCBmaXJlIGlmIHRoaXMgaGFwcGVucywgYnV0IGl0J3MgaW1wb3J0YW50IHRvIGNvZGUgc3RvcCBm dW5jdGlvbnMKLSAgICAvLyBzbyBpdCB3aWxsIG5vdCBoYXBwZW4hCi0gICAgU2NyaXB0RGlzYWxs b3dlZFNjb3BlIHNjcmlwdERpc2FsbG93ZWRTY29wZTsKLSAgICBmb3IgKGF1dG8qIGFjdGl2ZURP TU9iamVjdCA6IHBvc3NpYmxlQWN0aXZlRE9NT2JqZWN0cykgewotICAgICAgICAvLyBDaGVjayBp ZiB0aGlzIG9iamVjdCB3YXMgZGVsZXRlZCBhbHJlYWR5LiBJZiBzbywganVzdCBza2lwIGl0Lgot ICAgICAgICAvLyBDYWxsaW5nIGNvbnRhaW5zIG9uIGEgcG9zc2libHktYWxyZWFkeS1kZWxldGVk IG9iamVjdCBpcyBPSyBiZWNhdXNlIHdlIGd1YXJhbnRlZQotICAgICAgICAvLyBubyBuZXcgb2Jq ZWN0IGNhbiBiZSBhZGRlZCwgc28gZXZlbiBpZiBhIG5ldyBvYmplY3QgZW5kcyB1cCBhbGxvY2F0 ZWQgd2l0aCB0aGUKLSAgICAgICAgLy8gc2FtZSBhZGRyZXNzLCB0aGF0IHdpbGwgYmUgKmFmdGVy KiB0aGlzIGZ1bmN0aW9uIGV4aXRzLgotICAgICAgICBpZiAoIW1fYWN0aXZlRE9NT2JqZWN0cy5j b250YWlucyhhY3RpdmVET01PYmplY3QpKQotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAg IGFjdGl2ZURPTU9iamVjdC0+c3RvcCgpOwotICAgIH0KLQotICAgIG1fYWN0aXZlRE9NT2JqZWN0 QWRkaXRpb25Gb3JiaWRkZW4gPSBmYWxzZTsKKyAgICBmb3JFYWNoQWN0aXZlRE9NT2JqZWN0KFtd KGF1dG8mIGFjdGl2ZURPTU9iamVjdCkgeworICAgICAgICBhY3RpdmVET01PYmplY3Quc3RvcCgp OworICAgICAgICByZXR1cm4gU2hvdWxkQ29udGludWU6OlllczsKKyAgICB9KTsKIH0KIAogdm9p ZCBTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpzdXNwZW5kQWN0aXZlRE9NT2JqZWN0SWZOZWVkZWQo QWN0aXZlRE9NT2JqZWN0JiBhY3RpdmVET01PYmplY3QpCkBAIC0zNTksNyArMzQ2LDYgQEAgdm9p ZCBTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpkaWRDcmVhdGVBY3RpdmVET01PYmplY3QoQWN0aXZl RE9NT2JqZWN0JiBhY3RpdmVET00KIAogdm9pZCBTY3JpcHRFeGVjdXRpb25Db250ZXh0Ojp3aWxs RGVzdHJveUFjdGl2ZURPTU9iamVjdChBY3RpdmVET01PYmplY3QmIGFjdGl2ZURPTU9iamVjdCkK IHsKLSAgICBSRUxFQVNFX0FTU0VSVCghbV9hY3RpdmVET01PYmplY3RSZW1vdmFsRm9yYmlkZGVu KTsKICAgICBtX2FjdGl2ZURPTU9iamVjdHMucmVtb3ZlKCZhY3RpdmVET01PYmplY3QpOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5o IGIvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaAppbmRleCAyMjRi M2FmOTBhMjQ1YWE1Y2UyNDMzNmI3YmJkYjc5ZTE0MjExMTRiLi4xNmI2YzUzY2IxM2Q4ZWE0NzY1 ZDdkZWIyNjg0N2JjNmZmMGQxOTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2Ny aXB0RXhlY3V0aW9uQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVj dXRpb25Db250ZXh0LmgKQEAgLTI5NCw2ICsyOTQsOSBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwg dm9pZCByZWZTY3JpcHRFeGVjdXRpb25Db250ZXh0KCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBk ZXJlZlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSA9IDA7CiAKKyAgICBlbnVtIGNsYXNzIFNob3Vs ZENvbnRpbnVlIHsgTm8sIFllcyB9OworICAgIHZvaWQgZm9yRWFjaEFjdGl2ZURPTU9iamVjdChj b25zdCBGdW5jdGlvbjxTaG91bGRDb250aW51ZShBY3RpdmVET01PYmplY3QmKT4mKSBjb25zdDsK KwogICAgIFJlamVjdGVkUHJvbWlzZVRyYWNrZXImIGVuc3VyZVJlamVjdGVkUHJvbWlzZVRyYWNr ZXJTbG93KCk7CiAKICAgICB2b2lkIGNoZWNrQ29uc2lzdGVuY3koKSBjb25zdDsKQEAgLTMyMCw4 ICszMjMsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9hY3RpdmVET01PYmplY3RzQXJlU3VzcGVu ZGVkIHsgZmFsc2UgfTsKICAgICBib29sIG1fYWN0aXZlRE9NT2JqZWN0c0FyZVN0b3BwZWQgeyBm YWxzZSB9OwogICAgIGJvb2wgbV9pbkRpc3BhdGNoRXJyb3JFdmVudCB7IGZhbHNlIH07Ci0gICAg Ym9vbCBtX2FjdGl2ZURPTU9iamVjdEFkZGl0aW9uRm9yYmlkZGVuIHsgZmFsc2UgfTsKLSAgICBi b29sIG1fYWN0aXZlRE9NT2JqZWN0UmVtb3ZhbEZvcmJpZGRlbiB7IGZhbHNlIH07CisgICAgbXV0 YWJsZSBib29sIG1fYWN0aXZlRE9NT2JqZWN0QWRkaXRpb25Gb3JiaWRkZW4geyBmYWxzZSB9Owog ICAgIGJvb2wgbV93aWxscHJvY2Vzc01lc3NhZ2VXaXRoTWVzc2FnZVBvcnRzU29vbiB7IGZhbHNl IH07CiAKICNpZiAhQVNTRVJUX0RJU0FCTEVECg== 345798 2018-07-25 16:21:25 -0700 2018-07-25 18:29:17 -0700 Patch bug-188025-20180725162124.patch text/plain 10724 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2U0NmZjY2E1ZTY5YmQ3 YjNiZmY4MjRkYTY0NTllZTY2OThmYjc3ZC4uMDU5NjE5NTY3OGU3NDQwMWJiNDhjYWI2ZGNjNjkw MThhMDExOTAxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE4LTA3LTI1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQWxsb3cgQWN0aXZlRE9NT2Jq ZWN0J3MgY2FuU3VzcGVuZCAvIHN1c3BlbmQgLyByZXN1bWUgb3ZlcnJpZGVzIHRvIGRlc3Ryb3kg QWN0aXZlRE9NT2JqZWN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg4MDI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQXBwbHkgdGhlIHNhbWUgbG9naWMgYXMgaW4gU2NyaXB0RXhlY3V0aW9uQ29udGV4 dDo6c3RvcEFjdGl2ZURPTU9iamVjdHMoKSB0byBzdXBwb3J0IGRlc3RydWN0aW9uIG9mCisgICAg ICAgIEFjdGl2ZURPTU9iamVjdHMgd2hpbGUgd2UncmUgY2FsbGluZyBBY3RpdmVET01PYmplY3Qn cyBjYW5TdXNwZW5kIC8gc3VzcGVuZCAvIHJlc3VtZSBvdmVycmlkZXMuCisKKyAgICAgICAgV2Ug Y29weSBtX2FjdGl2ZURPTU9iamVjdHMgaW50byBhIFZlY3RvciBhbmQgaXRlcmF0ZSBvdmVyIHRo ZSBjb3B5IGluc3RlYWQgb2YgbV9hY3RpdmVET01PYmplY3RzLgorICAgICAgICBTaW5jZSBBY3Rp dmVET01PYmplY3QgaXMgbm90IFJlZkNvdW50ZWQgb3IgQ2FuTWFrZVdlYWtQdHIsIHdlIHZlcmlm eSB0aGF0IHRoZSByYXcgcG9pbnRlciBpcyBzdGlsbAorICAgICAgICB2YWxpZCBieSBjaGVja2lu ZyBpZiBtX2FjdGl2ZURPTU9iamVjdHMgc3RpbGwgY29udGFpbnMgaXQsIGFzIHdlIGl0ZXJhdGUu IFRoaXMgaXMgc2FmZSBhcyB0aGUKKyAgICAgICAgQWN0aXZlRE9NT2JqZWN0IGRlc3RydWN0b3Ig cmVtb3ZlcyB0aGUgb2JqZWN0IGZyb20gU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6bV9hY3RpdmVE T01PYmplY3RzLgorICAgICAgICBOZXcgQWN0aXZlRE9NT2JqZWN0cyB3aXRoIHRoZSBzYW1lIHBv aW50ZXIgdmFsdWUgY2Fubm90IGJlIGNyZWF0ZWQgd2hpbGUgd2UgaXRlcmF0ZSBhcyB3ZSBhbHJl YWR5CisgICAgICAgIHByZXZlbnQgdGhlIGNvbnN0cnVjdGlvbiBvZiBuZXcgQWN0aXZlRE9NT2Jq ZWN0cyB3aGlsZSB3ZSBpdGVyYXRlIHZpYSBSRUxFQVNFX0FTU0VSVCgpLgorCisgICAgICAgICog ZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0 RXhlY3V0aW9uQ29udGV4dDo6Y2FuU3VzcGVuZEFjdGl2ZURPTU9iamVjdHNGb3JEb2N1bWVudFN1 c3BlbnNpb24pOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6Zm9y RWFjaEFjdGl2ZURPTU9iamVjdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRFeGVj dXRpb25Db250ZXh0OjpzdXNwZW5kQWN0aXZlRE9NT2JqZWN0cyk6CisgICAgICAgIChXZWJDb3Jl OjpTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpyZXN1bWVBY3RpdmVET01PYmplY3RzKToKKyAgICAg ICAgKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnN0b3BBY3RpdmVET01PYmplY3Rz KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OndpbGxEZXN0cm95 QWN0aXZlRE9NT2JqZWN0KToKKyAgICAgICAgKiBkb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5o OgorCiAyMDE4LTA3LTI1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAg ICAgUkVHUkVTU0lPTihyMjI3NTc3KSBUZXh0IG9uIFRWICYgTW92aWVzIHBhZ2UgZG9lc24ndCB3 cmFwIHByb3Blcmx5IGluIGlUdW5lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1Nj cmlwdEV4ZWN1dGlvbkNvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1 dGlvbkNvbnRleHQuY3BwCmluZGV4IDQzOTQ0OTQxZTg2YjU0MjA4MjIwYmU2ZGVmNmZhZTVmMTcy MzVkOGEuLmFmZTI2ZjI1ZjE5MGMwNDYzYzkxNzFiOGQ4MDY0MjY1MzE3MmZkMWUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5jcHAKQEAgLTYxLDYgKzYx LDcgQEAKICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9TdHJvbmdJbmxpbmVzLmg+CiAjaW5jbHVk ZSA8d3RmL01haW5UaHJlYWQuaD4KICNpbmNsdWRlIDx3dGYvUmVmLmg+CisjaW5jbHVkZSA8d3Rm L1NldEZvclNjb3BlLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIHVzaW5nIG5hbWVzcGFjZSBJ bnNwZWN0b3I7CkBAIC0yMjgsMzAgKzIyOSw1MSBAQCBib29sIFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQ6OmNhblN1c3BlbmRBY3RpdmVET01PYmplY3RzRm9yRG9jdW1lbnRTdXNwZW5zaW9uKFZlYwog CiAgICAgYm9vbCBjYW5TdXNwZW5kID0gdHJ1ZTsKIAotICAgIG1fYWN0aXZlRE9NT2JqZWN0QWRk aXRpb25Gb3JiaWRkZW4gPSB0cnVlOwotICAgIG1fYWN0aXZlRE9NT2JqZWN0UmVtb3ZhbEZvcmJp ZGRlbiA9IHRydWU7Ci0KLSAgICAvLyBXZSBhc3N1bWUgdGhhdCBtX2FjdGl2ZURPTU9iamVjdHMg d2lsbCBub3QgY2hhbmdlIGR1cmluZyBpdGVyYXRpb246IGNhblN1c3BlbmQKLSAgICAvLyBmdW5j dGlvbnMgc2hvdWxkIG5vdCBhZGQgbmV3IGFjdGl2ZSBET00gb2JqZWN0cywgbm9yIGV4ZWN1dGUg YXJiaXRyYXJ5IEphdmFTY3JpcHQuCi0gICAgLy8gQW4gQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1Q TElDQVRJT04gb3IgUkVMRUFTRV9BU1NFUlQgd2lsbCBmaXJlIGlmIHRoaXMgaGFwcGVucywgYnV0 IGl0J3MgaW1wb3J0YW50IHRvIGNvZGUKLSAgICAvLyBjYW5TdXNwZW5kIGZ1bmN0aW9ucyBzbyBp dCB3aWxsIG5vdCBoYXBwZW4hCi0gICAgU2NyaXB0RGlzYWxsb3dlZFNjb3BlOjpJbk1haW5UaHJl YWQgc2NyaXB0RGlzYWxsb3dlZFNjb3BlOwotICAgIGZvciAoYXV0byogYWN0aXZlRE9NT2JqZWN0 IDogbV9hY3RpdmVET01PYmplY3RzKSB7Ci0gICAgICAgIGlmICghYWN0aXZlRE9NT2JqZWN0LT5j YW5TdXNwZW5kRm9yRG9jdW1lbnRTdXNwZW5zaW9uKCkpIHsKKyAgICBmb3JFYWNoQWN0aXZlRE9N T2JqZWN0KFsmXShhdXRvJiBhY3RpdmVET01PYmplY3QpIHsKKyAgICAgICAgaWYgKCFhY3RpdmVE T01PYmplY3QuY2FuU3VzcGVuZEZvckRvY3VtZW50U3VzcGVuc2lvbigpKSB7CiAgICAgICAgICAg ICBjYW5TdXNwZW5kID0gZmFsc2U7CiAgICAgICAgICAgICBpZiAodW5zdXNwZW5kYWJsZU9iamVj dHMpCi0gICAgICAgICAgICAgICAgdW5zdXNwZW5kYWJsZU9iamVjdHMtPmFwcGVuZChhY3RpdmVE T01PYmplY3QpOworICAgICAgICAgICAgICAgIHVuc3VzcGVuZGFibGVPYmplY3RzLT5hcHBlbmQo JmFjdGl2ZURPTU9iamVjdCk7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgYnJl YWs7CisgICAgICAgICAgICAgICAgcmV0dXJuIFNob3VsZENvbnRpbnVlOjpObzsKICAgICAgICAg fQotICAgIH0KKyAgICAgICAgcmV0dXJuIFNob3VsZENvbnRpbnVlOjpZZXM7CisgICAgfSk7CiAK LSAgICBtX2FjdGl2ZURPTU9iamVjdEFkZGl0aW9uRm9yYmlkZGVuID0gZmFsc2U7Ci0gICAgbV9h Y3RpdmVET01PYmplY3RSZW1vdmFsRm9yYmlkZGVuID0gZmFsc2U7CisgICAgaWYgKHVuc3VzcGVu ZGFibGVPYmplY3RzKSB7CisgICAgICAgIC8vIFJlbW92ZSBhY3RpdmVET01PYmplY3RzIHRoYXQg aGF2ZSBiZWVuIGRlc3Ryb3llZCB3aGlsZSB3ZSB3ZXJlIGl0ZXJhdGluZyBhYm92ZS4KKyAgICAg ICAgdW5zdXNwZW5kYWJsZU9iamVjdHMtPnJlbW92ZUFsbE1hdGNoaW5nKFsmXShhdXRvKiBhY3Rp dmVET01PYmplY3QpIHsKKyAgICAgICAgICAgIHJldHVybiAhbV9hY3RpdmVET01PYmplY3RzLmNv bnRhaW5zKGFjdGl2ZURPTU9iamVjdCk7CisgICAgICAgIH0pOworICAgIH0KIAogICAgIHJldHVy biBjYW5TdXNwZW5kOwogfQogCit2b2lkIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OmZvckVhY2hB Y3RpdmVET01PYmplY3QoY29uc3QgRnVuY3Rpb248U2hvdWxkQ29udGludWUoQWN0aXZlRE9NT2Jq ZWN0Jik+JiBhcHBseSkgY29uc3QKK3sKKyAgICAvLyBJdCBpcyBub3QgYWxsb3dlZCB0byBydW4g YXJiaXRyYXJ5IHNjcmlwdCBvciBjb25zdHJ1Y3QgbmV3IEFjdGl2ZURPTU9iamVjdHMgd2hpbGUg d2UgYXJlIGl0ZXJhdGluZyBvdmVyIEFjdGl2ZURPTU9iamVjdHMuCisgICAgLy8gQW4gQVNTRVJU X1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04gb3IgUkVMRUFTRV9BU1NFUlQgd2lsbCBmaXJlIGlm IHRoaXMgaGFwcGVucywgYnV0IGl0J3MgaW1wb3J0YW50IHRvIGNvZGUKKyAgICAvLyBjYW5TdXNw ZW5kQWN0aXZlRE9NT2JqZWN0c0ZvckRvY3VtZW50U3VzcGVuc2lvbigpIC8gc3VzcGVuZCgpIC8g cmVzdW1lKCkgLyBzdG9wKCkgZnVuY3Rpb25zIHNvIGl0IHdpbGwgbm90IGhhcHBlbiEKKyAgICBT Y3JpcHREaXNhbGxvd2VkU2NvcGUgc2NyaXB0RGlzYWxsb3dlZFNjb3BlOworICAgIFNldEZvclNj b3BlPGJvb2w+IGFjdGl2ZURPTU9iamVjdEFkZGl0aW9uRm9yYmlkZGVuU2NvcGUobV9hY3RpdmVE T01PYmplY3RBZGRpdGlvbkZvcmJpZGRlbiwgdHJ1ZSk7CisKKyAgICAvLyBNYWtlIGEgZnJvemVu IGNvcHkgb2YgdGhlIG9iamVjdHMgc28gd2UgY2FuIGl0ZXJhdGUgd2hpbGUgbmV3IG9uZXMgbWln aHQgYmUgZGVzdHJveWVkLgorICAgIGF1dG8gcG9zc2libGVBY3RpdmVET01PYmplY3RzID0gY29w eVRvVmVjdG9yKG1fYWN0aXZlRE9NT2JqZWN0cyk7CisKKyAgICBmb3IgKGF1dG8qIGFjdGl2ZURP TU9iamVjdCA6IHBvc3NpYmxlQWN0aXZlRE9NT2JqZWN0cykgeworICAgICAgICAvLyBDaGVjayBp ZiB0aGlzIG9iamVjdCB3YXMgZGVsZXRlZCBhbHJlYWR5LiBJZiBzbywganVzdCBza2lwIGl0Lgor ICAgICAgICAvLyBDYWxsaW5nIGNvbnRhaW5zIG9uIGEgcG9zc2libHktYWxyZWFkeS1kZWxldGVk IG9iamVjdCBpcyBPSyBiZWNhdXNlIHdlIGd1YXJhbnRlZQorICAgICAgICAvLyBubyBuZXcgb2Jq ZWN0IGNhbiBiZSBhZGRlZCwgc28gZXZlbiBpZiBhIG5ldyBvYmplY3QgZW5kcyB1cCBhbGxvY2F0 ZWQgd2l0aCB0aGUKKyAgICAgICAgLy8gc2FtZSBhZGRyZXNzLCB0aGF0IHdpbGwgYmUgKmFmdGVy KiB0aGlzIGZ1bmN0aW9uIGV4aXRzLgorICAgICAgICBpZiAoIW1fYWN0aXZlRE9NT2JqZWN0cy5j b250YWlucyhhY3RpdmVET01PYmplY3QpKQorICAgICAgICAgICAgY29udGludWU7CisKKyAgICAg ICAgaWYgKGFwcGx5KCphY3RpdmVET01PYmplY3QpID09IFNob3VsZENvbnRpbnVlOjpObykKKyAg ICAgICAgICAgIGJyZWFrOworICAgIH0KK30KKwogdm9pZCBTY3JpcHRFeGVjdXRpb25Db250ZXh0 OjpzdXNwZW5kQWN0aXZlRE9NT2JqZWN0cyhSZWFzb25Gb3JTdXNwZW5zaW9uIHdoeSkKIHsKICAg ICBjaGVja0NvbnNpc3RlbmN5KCk7CkBAIC0yNjYsMTkgKzI4OCwxMCBAQCB2b2lkIFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQ6OnN1c3BlbmRBY3RpdmVET01PYmplY3RzKFJlYXNvbkZvclN1c3BlbnNp b24gd2h5KQogCiAgICAgbV9hY3RpdmVET01PYmplY3RzQXJlU3VzcGVuZGVkID0gdHJ1ZTsKIAot ICAgIG1fYWN0aXZlRE9NT2JqZWN0QWRkaXRpb25Gb3JiaWRkZW4gPSB0cnVlOwotICAgIG1fYWN0 aXZlRE9NT2JqZWN0UmVtb3ZhbEZvcmJpZGRlbiA9IHRydWU7Ci0KLSAgICAvLyBXZSBhc3N1bWUg dGhhdCBtX2FjdGl2ZURPTU9iamVjdHMgd2lsbCBub3QgY2hhbmdlIGR1cmluZyBpdGVyYXRpb246 IHN1c3BlbmQKLSAgICAvLyBmdW5jdGlvbnMgc2hvdWxkIG5vdCBhZGQgbmV3IGFjdGl2ZSBET00g b2JqZWN0cywgbm9yIGV4ZWN1dGUgYXJiaXRyYXJ5IEphdmFTY3JpcHQuCi0gICAgLy8gQW4gQVNT RVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04gb3IgUkVMRUFTRV9BU1NFUlQgd2lsbCBmaXJl IGlmIHRoaXMgaGFwcGVucywgYnV0IGl0J3MgaW1wb3J0YW50IHRvIGNvZGUKLSAgICAvLyBzdXNw ZW5kIGZ1bmN0aW9ucyBzbyBpdCB3aWxsIG5vdCBoYXBwZW4hCi0gICAgU2NyaXB0RGlzYWxsb3dl ZFNjb3BlOjpJbk1haW5UaHJlYWQgc2NyaXB0RGlzYWxsb3dlZFNjb3BlOwotICAgIGZvciAoYXV0 byogYWN0aXZlRE9NT2JqZWN0IDogbV9hY3RpdmVET01PYmplY3RzKQotICAgICAgICBhY3RpdmVE T01PYmplY3QtPnN1c3BlbmQod2h5KTsKLQotICAgIG1fYWN0aXZlRE9NT2JqZWN0QWRkaXRpb25G b3JiaWRkZW4gPSBmYWxzZTsKLSAgICBtX2FjdGl2ZURPTU9iamVjdFJlbW92YWxGb3JiaWRkZW4g PSBmYWxzZTsKKyAgICBmb3JFYWNoQWN0aXZlRE9NT2JqZWN0KFt3aHldKGF1dG8mIGFjdGl2ZURP TU9iamVjdCkgeworICAgICAgICBhY3RpdmVET01PYmplY3Quc3VzcGVuZCh3aHkpOworICAgICAg ICByZXR1cm4gU2hvdWxkQ29udGludWU6OlllczsKKyAgICB9KTsKIAogICAgIG1fcmVhc29uRm9y U3VzcGVuZGluZ0FjdGl2ZURPTU9iamVjdHMgPSB3aHk7CiB9CkBAIC0yOTEsMTkgKzMwNCwxMCBA QCB2b2lkIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnJlc3VtZUFjdGl2ZURPTU9iamVjdHMoUmVh c29uRm9yU3VzcGVuc2lvbiB3aHkpCiAgICAgICAgIHJldHVybjsKICAgICBtX2FjdGl2ZURPTU9i amVjdHNBcmVTdXNwZW5kZWQgPSBmYWxzZTsKIAotICAgIG1fYWN0aXZlRE9NT2JqZWN0QWRkaXRp b25Gb3JiaWRkZW4gPSB0cnVlOwotICAgIG1fYWN0aXZlRE9NT2JqZWN0UmVtb3ZhbEZvcmJpZGRl biA9IHRydWU7Ci0KLSAgICAvLyBXZSBhc3N1bWUgdGhhdCBtX2FjdGl2ZURPTU9iamVjdHMgd2ls bCBub3QgY2hhbmdlIGR1cmluZyBpdGVyYXRpb246IHJlc3VtZQotICAgIC8vIGZ1bmN0aW9ucyBz aG91bGQgbm90IGFkZCBuZXcgYWN0aXZlIERPTSBvYmplY3RzLCBub3IgZXhlY3V0ZSBhcmJpdHJh cnkgSmF2YVNjcmlwdC4KLSAgICAvLyBBbiBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElP TiBvciBSRUxFQVNFX0FTU0VSVCB3aWxsIGZpcmUgaWYgdGhpcyBoYXBwZW5zLCBidXQgaXQncyBp bXBvcnRhbnQgdG8gY29kZQotICAgIC8vIHJlc3VtZSBmdW5jdGlvbnMgc28gaXQgd2lsbCBub3Qg aGFwcGVuIQotICAgIFNjcmlwdERpc2FsbG93ZWRTY29wZTo6SW5NYWluVGhyZWFkIHNjcmlwdERp c2FsbG93ZWRTY29wZTsKLSAgICBmb3IgKGF1dG8qIGFjdGl2ZURPTU9iamVjdCA6IG1fYWN0aXZl RE9NT2JqZWN0cykKLSAgICAgICAgYWN0aXZlRE9NT2JqZWN0LT5yZXN1bWUoKTsKLQotICAgIG1f YWN0aXZlRE9NT2JqZWN0QWRkaXRpb25Gb3JiaWRkZW4gPSBmYWxzZTsKLSAgICBtX2FjdGl2ZURP TU9iamVjdFJlbW92YWxGb3JiaWRkZW4gPSBmYWxzZTsKKyAgICBmb3JFYWNoQWN0aXZlRE9NT2Jq ZWN0KFtdKGF1dG8mIGFjdGl2ZURPTU9iamVjdCkgeworICAgICAgICBhY3RpdmVET01PYmplY3Qu cmVzdW1lKCk7CisgICAgICAgIHJldHVybiBTaG91bGRDb250aW51ZTo6WWVzOworICAgIH0pOwog fQogCiB2b2lkIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnN0b3BBY3RpdmVET01PYmplY3RzKCkK QEAgLTMxNCwyNyArMzE4LDEwIEBAIHZvaWQgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6c3RvcEFj dGl2ZURPTU9iamVjdHMoKQogICAgICAgICByZXR1cm47CiAgICAgbV9hY3RpdmVET01PYmplY3Rz QXJlU3RvcHBlZCA9IHRydWU7CiAKLSAgICAvLyBNYWtlIGEgZnJvemVuIGNvcHkgb2YgdGhlIG9i amVjdHMgc28gd2UgY2FuIGl0ZXJhdGUgd2hpbGUgbmV3IG9uZXMgbWlnaHQgYmUgZGVzdHJveWVk LgotICAgIGF1dG8gcG9zc2libGVBY3RpdmVET01PYmplY3RzID0gY29weVRvVmVjdG9yKG1fYWN0 aXZlRE9NT2JqZWN0cyk7Ci0KLSAgICBtX2FjdGl2ZURPTU9iamVjdEFkZGl0aW9uRm9yYmlkZGVu ID0gdHJ1ZTsKLQotICAgIC8vIFdlIGFzc3VtZSB0aGF0IG5ldyBvYmplY3RzIHdpbGwgbm90IGJl IGFkZGVkIHRvIG1fYWN0aXZlRE9NT2JqZWN0cyBkdXJpbmcgaXRlcmF0aW9uOgotICAgIC8vIHN0 b3AgZnVuY3Rpb25zIHNob3VsZCBub3QgYWRkIG5ldyBhY3RpdmUgRE9NIG9iamVjdHMsIG5vciBl eGVjdXRlIGFyYml0cmFyeSBKYXZhU2NyaXB0LgotICAgIC8vIEFuIEFTU0VSVF9XSVRIX1NFQ1VS SVRZX0lNUExJQ0FUSU9OIG9yIFJFTEVBU0VfQVNTRVJUIHdpbGwgZmlyZSBpZiB0aGlzIGhhcHBl bnMsIGJ1dCBpdCdzIGltcG9ydGFudCB0byBjb2RlIHN0b3AgZnVuY3Rpb25zCi0gICAgLy8gc28g aXQgd2lsbCBub3QgaGFwcGVuIQotICAgIFNjcmlwdERpc2FsbG93ZWRTY29wZSBzY3JpcHREaXNh bGxvd2VkU2NvcGU7Ci0gICAgZm9yIChhdXRvKiBhY3RpdmVET01PYmplY3QgOiBwb3NzaWJsZUFj dGl2ZURPTU9iamVjdHMpIHsKLSAgICAgICAgLy8gQ2hlY2sgaWYgdGhpcyBvYmplY3Qgd2FzIGRl bGV0ZWQgYWxyZWFkeS4gSWYgc28sIGp1c3Qgc2tpcCBpdC4KLSAgICAgICAgLy8gQ2FsbGluZyBj b250YWlucyBvbiBhIHBvc3NpYmx5LWFscmVhZHktZGVsZXRlZCBvYmplY3QgaXMgT0sgYmVjYXVz ZSB3ZSBndWFyYW50ZWUKLSAgICAgICAgLy8gbm8gbmV3IG9iamVjdCBjYW4gYmUgYWRkZWQsIHNv IGV2ZW4gaWYgYSBuZXcgb2JqZWN0IGVuZHMgdXAgYWxsb2NhdGVkIHdpdGggdGhlCi0gICAgICAg IC8vIHNhbWUgYWRkcmVzcywgdGhhdCB3aWxsIGJlICphZnRlciogdGhpcyBmdW5jdGlvbiBleGl0 cy4KLSAgICAgICAgaWYgKCFtX2FjdGl2ZURPTU9iamVjdHMuY29udGFpbnMoYWN0aXZlRE9NT2Jq ZWN0KSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBhY3RpdmVET01PYmplY3QtPnN0 b3AoKTsKLSAgICB9Ci0KLSAgICBtX2FjdGl2ZURPTU9iamVjdEFkZGl0aW9uRm9yYmlkZGVuID0g ZmFsc2U7CisgICAgZm9yRWFjaEFjdGl2ZURPTU9iamVjdChbXShhdXRvJiBhY3RpdmVET01PYmpl Y3QpIHsKKyAgICAgICAgYWN0aXZlRE9NT2JqZWN0LnN0b3AoKTsKKyAgICAgICAgcmV0dXJuIFNo b3VsZENvbnRpbnVlOjpZZXM7CisgICAgfSk7CiB9CiAKIHZvaWQgU2NyaXB0RXhlY3V0aW9uQ29u dGV4dDo6c3VzcGVuZEFjdGl2ZURPTU9iamVjdElmTmVlZGVkKEFjdGl2ZURPTU9iamVjdCYgYWN0 aXZlRE9NT2JqZWN0KQpAQCAtMzU5LDcgKzM0Niw2IEBAIHZvaWQgU2NyaXB0RXhlY3V0aW9uQ29u dGV4dDo6ZGlkQ3JlYXRlQWN0aXZlRE9NT2JqZWN0KEFjdGl2ZURPTU9iamVjdCYgYWN0aXZlRE9N CiAKIHZvaWQgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6d2lsbERlc3Ryb3lBY3RpdmVET01PYmpl Y3QoQWN0aXZlRE9NT2JqZWN0JiBhY3RpdmVET01PYmplY3QpCiB7Ci0gICAgUkVMRUFTRV9BU1NF UlQoIW1fYWN0aXZlRE9NT2JqZWN0UmVtb3ZhbEZvcmJpZGRlbik7CiAgICAgbV9hY3RpdmVET01P YmplY3RzLnJlbW92ZSgmYWN0aXZlRE9NT2JqZWN0KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmgKaW5kZXggMjI0YjNhZjkwYTI0NWFhNWNlMjQzMzZi N2JiZGI3OWUxNDIxMTE0Yi4uMTZiNmM1M2NiMTNkOGVhNDc2NWQ3ZGViMjY4NDdiYzZmZjBkMTky ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oCkBAIC0y OTQsNiArMjk0LDkgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgcmVmU2NyaXB0RXhlY3V0 aW9uQ29udGV4dCgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGVyZWZTY3JpcHRFeGVjdXRpb25D b250ZXh0KCkgPSAwOwogCisgICAgZW51bSBjbGFzcyBTaG91bGRDb250aW51ZSB7IE5vLCBZZXMg fTsKKyAgICB2b2lkIGZvckVhY2hBY3RpdmVET01PYmplY3QoY29uc3QgRnVuY3Rpb248U2hvdWxk Q29udGludWUoQWN0aXZlRE9NT2JqZWN0Jik+JikgY29uc3Q7CisKICAgICBSZWplY3RlZFByb21p c2VUcmFja2VyJiBlbnN1cmVSZWplY3RlZFByb21pc2VUcmFja2VyU2xvdygpOwogCiAgICAgdm9p ZCBjaGVja0NvbnNpc3RlbmN5KCkgY29uc3Q7CkBAIC0zMjAsOCArMzIzLDcgQEAgcHJpdmF0ZToK ICAgICBib29sIG1fYWN0aXZlRE9NT2JqZWN0c0FyZVN1c3BlbmRlZCB7IGZhbHNlIH07CiAgICAg Ym9vbCBtX2FjdGl2ZURPTU9iamVjdHNBcmVTdG9wcGVkIHsgZmFsc2UgfTsKICAgICBib29sIG1f aW5EaXNwYXRjaEVycm9yRXZlbnQgeyBmYWxzZSB9OwotICAgIGJvb2wgbV9hY3RpdmVET01PYmpl Y3RBZGRpdGlvbkZvcmJpZGRlbiB7IGZhbHNlIH07Ci0gICAgYm9vbCBtX2FjdGl2ZURPTU9iamVj dFJlbW92YWxGb3JiaWRkZW4geyBmYWxzZSB9OworICAgIG11dGFibGUgYm9vbCBtX2FjdGl2ZURP TU9iamVjdEFkZGl0aW9uRm9yYmlkZGVuIHsgZmFsc2UgfTsKICAgICBib29sIG1fd2lsbHByb2Nl c3NNZXNzYWdlV2l0aE1lc3NhZ2VQb3J0c1Nvb24geyBmYWxzZSB9OwogCiAjaWYgIUFTU0VSVF9E SVNBQkxFRAo=