87070 2012-05-21 19:08:30 -0700 [V8] Add an optional 'isolate' argument to throwTypeError() 2012-05-22 01:40:24 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84074 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 629854 0 haraken 2012-05-21 19:08:30 -0700 The objective is to pass Isolate around in V8 bindings. In this bug we add an optional 'isolate' argument to throwTypeError(), and passes Isolate to throwTypeError(). In a following patch, I'll pass Isolate to all throwTypeError()s. 629857 1 143170 haraken 2012-05-21 19:13:02 -0700 Created attachment 143170 Patch 630054 2 143217 haraken 2012-05-22 00:50:57 -0700 Created attachment 143217 rebased patch for landing 630087 3 143217 webkit.review.bot 2012-05-22 01:37:52 -0700 Comment on attachment 143217 rebased patch for landing Clearing flags on attachment: 143217 Committed r117933: <http://trac.webkit.org/changeset/117933> 143170 2012-05-21 19:13:02 -0700 2012-05-22 01:40:17 -0700 Patch bug-87070-20120522111300.patch text/plain 14555 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3ODY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA1ZjliOWYyMDRlNjgy Yzg1YmU2NzBkZjI3NzU2MWFmYzBmYThkYi4uNDExYzVhNDMwMzRmZTE1MTQzNDEwMjI2MWI4ZDJj NjM1NTM2OTVhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEyLTA1LTIxICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIEFkZCBhbiBv cHRpb25hbCAnaXNvbGF0ZScgYXJndW1lbnQgdG8gdGhyb3dUeXBlRXJyb3IoKQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODcwNzAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgb2JqZWN0aXZlIGlzIHRv IHBhc3MgSXNvbGF0ZSBhcm91bmQgaW4gVjggYmluZGluZ3MuCisgICAgICAgIFRoaXMgcGF0Y2gg YWRkcyBhbiBvcHRpb25hbCAnaXNvbGF0ZScgYXJndW1lbnQgdG8gdGhyb3dUeXBlRXJyb3IoKSwK KyAgICAgICAgYW5kIHBhc3NlcyBJc29sYXRlIHRvIHRocm93VHlwZUVycm9yKClzLiBJbiBhIGZv bGxvd2luZyBwYXRjaCwKKyAgICAgICAgSSdsbCBwYXNzIElzb2xhdGUgdG8gYWxsIHRocm93VHlw ZUVycm9yKCJtZXNzYWdlIilzLgorCisgICAgICAgIE5vIHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVo YXZpb3IuCisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbToK KyAgICAgICAgKEdlbmVyYXRlTm9ybWFsQXR0clNldHRlcik6CisgICAgICAgIChHZW5lcmF0ZU92 ZXJsb2FkZWRGdW5jdGlvbkNhbGxiYWNrKToKKyAgICAgICAgKEdlbmVyYXRlUGFyYW1ldGVyc0No ZWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T2JqLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlRlc3RPYmpWOEludGVybmFsOjpvdmVybG9hZGVkTWV0aG9kQ2Fs bGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6VGVzdE9ialY4SW50ZXJuYWw6Om92ZXJsb2FkZWRN ZXRob2QxQ2FsbGJhY2spOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6VjhQcm94eTo6dGhyb3dUeXBlRXJyb3IpOgorICAgICAgICAqIGJpbmRp bmdzL3Y4L1Y4UHJveHkuaDoKKyAgICAgICAgKFY4UHJveHkpOgorICAgICAgICAqIGJpbmRpbmdz L3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oOgorICAgICAgICAoV2ViQ29yZTo6 Y29uc3RydWN0V2ViR0xBcnJheSk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGF0 YVZpZXdDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhEYXRhVmlldzo6Y29uc3RydWN0 b3JDYWxsYmFjayk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4U1ZHTGVuZ3RoQ3Vz dG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4U1ZHTGVuZ3RoOjp2YWx1ZUFjY2Vzc29yU2V0 dGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhXZWJHTFJlbmRlcmluZ0NvbnRl eHRDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhXZWJHTFJlbmRlcmluZ0NvbnRleHQ6 OmdldEF0dGFjaGVkU2hhZGVyc0NhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OlY4V2ViR0xS ZW5kZXJpbmdDb250ZXh0OjpnZXRQcm9ncmFtUGFyYW1ldGVyQ2FsbGJhY2spOgorICAgICAgICAo V2ViQ29yZTo6VjhXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmdldFNoYWRlclBhcmFtZXRlckNhbGxi YWNrKToKKyAgICAgICAgKFdlYkNvcmU6OlY4V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpnZXRVbmlm b3JtQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6dmVydGV4QXR0cmliQW5kVW5pZm9ybUhl bHBlcmYpOgorICAgICAgICAoV2ViQ29yZTo6dW5pZm9ybUhlbHBlcmkpOgorICAgICAgICAoV2Vi Q29yZTo6dW5pZm9ybU1hdHJpeEhlbHBlcik6CisKIDIwMTItMDUtMjEgIEphbWVzIFJvYmluc29u ICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIFBvcnQgY2hyb21p dW0gY29tcG9zaXRvciB0byB1c2UgV2ViRmlsdGVyT3BlcmF0aW9uKHMpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbSBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCmluZGV4IGUxODMy OWUwZTI2MmM0ZWFjOGViNTBlMjM5MDNhZTI4OWI3NTNhZDIuLjM3MmQyNjI5ZjE0NjM4YjgyZmYy OWM0OGI4MzljMzJkYzdlZDliNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCkBAIC0xMDQ2LDcgKzEwNDYsNyBAQCBzdWIgR2Vu ZXJhdGVOb3JtYWxBdHRyU2V0dGVyCiAgICAgICAgIG15ICRhcmdUeXBlID0gR2V0VHlwZUZyb21T aWduYXR1cmUoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlKTsKICAgICAgICAgaWYgKElzV3JhcHBlclR5 cGUoJGFyZ1R5cGUpKSB7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAg IGlmICghaXNVbmRlZmluZWRPck51bGwodmFsdWUpICYmICFWOCR7YXJnVHlwZX06Okhhc0luc3Rh bmNlKHZhbHVlKSkge1xuIik7Ci0gICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAi ICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpO1xuIik7CisgICAgICAgICAgICBwdXNo KEBpbXBsQ29udGVudERlY2xzLCAiICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigwLCBp bmZvLkdldElzb2xhdGUoKSk7XG4iKTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVj bHMsICIgICAgICAgIHJldHVybjtcbiIpOwogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnRE ZWNscywgIiAgICB9XG4iKTsKICAgICAgICAgfQpAQCAtMTM0Niw3ICsxMzQ2LDcgQEAgRU5ECiAg ICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgICAgIHJldHVybiAke25hbWV9JG92 ZXJsb2FkLT57b3ZlcmxvYWRJbmRleH1DYWxsYmFjayhhcmdzKTtcbiIpOwogICAgIH0KICAgICBw dXNoKEBpbXBsQ29udGVudERlY2xzLCA8PEVORCk7Ci0gICAgVjhQcm94eTo6dGhyb3dUeXBlRXJy b3IoKTsKKyAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigwLCBhcmdzLkdldElzb2xhdGUoKSk7 CiAgICAgcmV0dXJuIG5vdEhhbmRsZWRCeUludGVyY2VwdG9yKCk7CiBFTkQKICAgICBwdXNoKEBp bXBsQ29udGVudERlY2xzLCAifVxuXG4iKTsKQEAgLTE2NTgsNyArMTY1OCw3IEBAIHN1YiBHZW5l cmF0ZVBhcmFtZXRlcnNDaGVjawogICAgICAgICAgICAgICAgIG15ICRhcmdUeXBlID0gR2V0VHlw ZUZyb21TaWduYXR1cmUoJHBhcmFtZXRlcik7CiAgICAgICAgICAgICAgICAgaWYgKElzV3JhcHBl clR5cGUoJGFyZ1R5cGUpKSB7CiAgICAgICAgICAgICAgICAgICAgICRwYXJhbWV0ZXJDaGVja1N0 cmluZyAuPSAiICAgIGlmIChhcmdzLkxlbmd0aCgpID4gJHBhcmFtSW5kZXggJiYgIWlzVW5kZWZp bmVkT3JOdWxsKCRhcmdWYWx1ZSkgJiYgIVY4JHthcmdUeXBlfTo6SGFzSW5zdGFuY2UoJGFyZ1Zh bHVlKSkge1xuIjsKLSAgICAgICAgICAgICAgICAgICAgJHBhcmFtZXRlckNoZWNrU3RyaW5nIC49 ICIgICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCk7XG4iOworICAgICAgICAgICAgICAg ICAgICAkcGFyYW1ldGVyQ2hlY2tTdHJpbmcgLj0gIiAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBl RXJyb3IoMCwgYXJncy5HZXRJc29sYXRlKCkpO1xuIjsKICAgICAgICAgICAgICAgICAgICAgJHBh cmFtZXRlckNoZWNrU3RyaW5nIC49ICIgICAgICAgIHJldHVybiBub3RIYW5kbGVkQnlJbnRlcmNl cHRvcigpO1xuIjsKICAgICAgICAgICAgICAgICAgICAgJHBhcmFtZXRlckNoZWNrU3RyaW5nIC49 ICIgICAgfVxuIjsKICAgICAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T2JqLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwCmluZGV4IGI3NDk2NzMyMzQ5 YWRhYTljYWVmZjY4YjE3NTJjNjQxY2VlODRlNWUuLjlmOTA5NTE2NjNkNmRjYWNhNjI2ODNhNzkz MjllOGYyNWNjNGRhYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwCkBAIC0xNzk1LDcgKzE3OTUsNyBAQCBzdGF0aWMg djg6OkhhbmRsZTx2ODo6VmFsdWU+IG92ZXJsb2FkZWRNZXRob2RDYWxsYmFjayhjb25zdCB2ODo6 QXJndW1lbnRzJiBhcmdzKQogICAgICAgICByZXR1cm4gb3ZlcmxvYWRlZE1ldGhvZDZDYWxsYmFj ayhhcmdzKTsKICAgICBpZiAoKGFyZ3MuTGVuZ3RoKCkgPT0gMSAmJiAoYXJnc1swXS0+SXNOdWxs KCkgfHwgYXJnc1swXS0+SXNBcnJheSgpKSkpCiAgICAgICAgIHJldHVybiBvdmVybG9hZGVkTWV0 aG9kN0NhbGxiYWNrKGFyZ3MpOwotICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCk7CisgICAg VjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoMCwgYXJncy5HZXRJc29sYXRlKCkpOwogICAgIHJldHVy biBub3RIYW5kbGVkQnlJbnRlcmNlcHRvcigpOwogfQogCkBAIC0xODUzLDcgKzE4NTMsNyBAQCBz dGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IG92ZXJsb2FkZWRNZXRob2QxQ2FsbGJhY2soY29u c3Qgdjg6OkFyZ3VtZW50cyYgYXJncwogICAgICAgICByZXR1cm4gb3ZlcmxvYWRlZE1ldGhvZDEx Q2FsbGJhY2soYXJncyk7CiAgICAgaWYgKChhcmdzLkxlbmd0aCgpID09IDEgJiYgKGFyZ3NbMF0t PklzTnVsbCgpIHx8IGFyZ3NbMF0tPklzVW5kZWZpbmVkKCkgfHwgYXJnc1swXS0+SXNTdHJpbmco KSB8fCBhcmdzWzBdLT5Jc09iamVjdCgpKSkpCiAgICAgICAgIHJldHVybiBvdmVybG9hZGVkTWV0 aG9kMTJDYWxsYmFjayhhcmdzKTsKLSAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOworICAg IFY4UHJveHk6OnRocm93VHlwZUVycm9yKDAsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICByZXR1 cm4gbm90SGFuZGxlZEJ5SW50ZXJjZXB0b3IoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9WOFByb3h5LmNwcAppbmRleCAzNjJmZTVlNjgwOTM2NjYwMzg0NzE0YjJmNTYyN2M4MWUyZDNi NDJkLi5lYTE2OGEwNDJiZmY4NzQ2Mzg4ZDQwMDE2ZGQ5NTZlNjc4ODMyYzI5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcApAQCAtNjMxLDkgKzYzMSw5IEBAIHY4OjpIYW5k bGU8djg6OlZhbHVlPiBWOFByb3h5Ojp0aHJvd0Vycm9yKEVycm9yVHlwZSB0eXBlLCBjb25zdCBj aGFyKiBtZXNzYWdlLCB2CiAgICAgfQogfQogCi12ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhQcm94 eTo6dGhyb3dUeXBlRXJyb3IoY29uc3QgY2hhciogbWVzc2FnZSkKK3Y4OjpIYW5kbGU8djg6OlZh bHVlPiBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcihjb25zdCBjaGFyKiBtZXNzYWdlLCB2ODo6SXNv bGF0ZSogaXNvbGF0ZSkKIHsKLSAgICByZXR1cm4gdGhyb3dFcnJvcihUeXBlRXJyb3IsIChtZXNz YWdlID8gbWVzc2FnZSA6ICJUeXBlIGVycm9yIikpOworICAgIHJldHVybiB0aHJvd0Vycm9yKFR5 cGVFcnJvciwgKG1lc3NhZ2UgPyBtZXNzYWdlIDogIlR5cGUgZXJyb3IiKSwgaXNvbGF0ZSk7CiB9 CiAKIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFByb3h5Ojp0aHJvd05vdEVub3VnaEFyZ3VtZW50 c0Vycm9yKHY4OjpJc29sYXRlKiBpc29sYXRlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvVjhQcm94eS5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94 eS5oCmluZGV4IGUwNWUzNzYzN2M4NGJiYjIzMjZiNmM0MTAwZTYwNGZkMTA2ZTA4MDYuLjM5YTkx ZjMxNTNhOGFkOWFmZmYwMWJhYTZkMWVjMmJiYWEzZDI5MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9WOFByb3h5LmgKQEAgLTIzOSw3ICsyMzksNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgICAgIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdGhyb3dFcnJvcihFcnJvclR5cGUs IGNvbnN0IGNoYXIqIG1lc3NhZ2UsIHY4OjpJc29sYXRlKiA9IDApOwogCiAgICAgICAgIC8vIEhl bHBlcnMgZm9yIHRocm93aW5nIHN5bnRheCBhbmQgdHlwZSBlcnJvcnMgd2l0aCBwcmVkZWZpbmVk IG1lc3NhZ2VzLgotICAgICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHRocm93VHlw ZUVycm9yKGNvbnN0IGNoYXIqID0gMCk7CisgICAgICAgIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gdGhyb3dUeXBlRXJyb3IoY29uc3QgY2hhciogPSAwLCB2ODo6SXNvbGF0ZSogPSAwKTsK ICAgICAgICAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB0aHJvd05vdEVub3VnaEFyZ3Vt ZW50c0Vycm9yKHY4OjpJc29sYXRlKik7CiAKICAgICAgICAgdjg6OkxvY2FsPHY4OjpDb250ZXh0 PiBjb250ZXh0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhBcnJheUJ1ZmZlclZpZXdDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L2N1c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCmluZGV4IDI3MzMwY2U5YzUyYWRjMTVl YjEwY2JkZDY0OWJkN2JlMzNhNWZmOWEuLjcyMWU4NzRiMzFjNGQ1OTQ4ODg5NTliODlkYTE5YTFm YWQzMTFjZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9W OEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L2N1c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCkBAIC0xMzgsOCArMTM4LDcgQEAgdjg6 OkhhbmRsZTx2ODo6VmFsdWU+IGNvbnN0cnVjdFdlYkdMQXJyYXkoY29uc3Qgdjg6OkFyZ3VtZW50 cyYgYXJncywgV3JhcHBlclR5cGUKIAogICAgIGlmIChhcmdzWzBdLT5Jc051bGwoKSkgewogICAg ICAgICAvLyBJbnZhbGlkIGZpcnN0IGFyZ3VtZW50Ci0gICAgICAgIC8vIEZJWE1FOiB1c2UgZm9y dGhjb21pbmcgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKS4KLSAgICAgICAgcmV0dXJuIFY4UHJv eHk6OnRocm93VHlwZUVycm9yKCk7CisgICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd1R5cGVF cnJvcigwLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgfQogCiAgICAgLy8gU2VlIHdoZXRoZXIg dGhlIGZpcnN0IGFyZ3VtZW50IGlzIGEgQXJyYXlCdWZmZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhEYXRhVmlld0N1c3RvbS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhEYXRhVmlld0N1c3RvbS5jcHAKaW5kZXggOTU0 MTg4ZTNiOWE0ZTE2N2FmOTdhNTJkZGRmMDg3MGY3MmQxMzgwMC4uZjFjOWQyN2UyNzFkOWQ4ZDky NWYyNWM2NThjOTE4ZDViYmVmNDczMCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvdjgvY3VzdG9tL1Y4RGF0YVZpZXdDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L2N1c3RvbS9WOERhdGFWaWV3Q3VzdG9tLmNwcApAQCAtNTMsNyArNTMsNyBAQCB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhEYXRhVmlldzo6Y29uc3RydWN0b3JDYWxsYmFjayhjb25z dCB2ODo6QXJndW1lbnRzJiBhcmdzKQogICAgICAgICByZXR1cm4gYXJncy5Ib2xkZXIoKTsKICAg ICB9CiAgICAgaWYgKGFyZ3NbMF0tPklzTnVsbCgpIHx8ICFWOEFycmF5QnVmZmVyOjpIYXNJbnN0 YW5jZShhcmdzWzBdKSkKLSAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCk7 CisgICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigwLCBhcmdzLkdldElzb2xh dGUoKSk7CiAgICAgcmV0dXJuIGNvbnN0cnVjdFdlYkdMQXJyYXlXaXRoQXJyYXlCdWZmZXJBcmd1 bWVudDxEYXRhVmlldywgY2hhcj4oYXJncywgJmluZm8sIHY4OjprRXh0ZXJuYWxCeXRlQXJyYXks IGZhbHNlKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4U1ZHTGVuZ3RoQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOFNWR0xlbmd0aEN1c3RvbS5jcHAKaW5kZXggMTBhMDczNWRhNDQ2NGVjOTRiNWM3MTI3 YTE3NzFiNmMwZjc5YjUzYy4uZjdkYTliZmYwY2FiZTIxNmUxNjQzMGNmMjAwMzAwZGQ1ZDQxMDc2 YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4U1ZHTGVu Z3RoQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhT VkdMZW5ndGhDdXN0b20uY3BwCkBAIC02Niw3ICs2Niw3IEBAIHZvaWQgVjhTVkdMZW5ndGg6OnZh bHVlQWNjZXNzb3JTZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIHY4OjpMb2NhbDx2 ODo6CiAgICAgfQogCiAgICAgaWYgKCFpc1VuZGVmaW5lZE9yTnVsbCh2YWx1ZSkgJiYgIXZhbHVl LT5Jc051bWJlcigpICYmICF2YWx1ZS0+SXNCb29sZWFuKCkpIHsKLSAgICAgICAgVjhQcm94eTo6 dGhyb3dUeXBlRXJyb3IoKTsKKyAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoMCwgaW5m by5HZXRJc29sYXRlKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhXZWJHTFJlbmRlcmluZ0NvbnRleHRD dXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4V2ViR0xSZW5k ZXJpbmdDb250ZXh0Q3VzdG9tLmNwcAppbmRleCBhZDA0ZjE4NDU2OWM1Mzg4NjNiMDc4NmNmZjUw N2U0YWJmNTc2YTA2Li4wNzI4MTc2MDc3NTcwNGQwZDQ4Y2U5NjE3NjZhZjE2ZjJiMjUyMGUzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhXZWJHTFJlbmRl cmluZ0NvbnRleHRDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOFdlYkdMUmVuZGVyaW5nQ29udGV4dEN1c3RvbS5jcHAKQEAgLTI3NCw3ICsyNzQsNyBA QCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmdldEF0dGFj aGVkU2hhZGVyc0NhbGxiYWNrKGNvbnN0CiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAg V2ViR0xSZW5kZXJpbmdDb250ZXh0KiBjb250ZXh0ID0gVjhXZWJHTFJlbmRlcmluZ0NvbnRleHQ6 OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOwogICAgIGlmIChhcmdzLkxlbmd0aCgpID4gMCAmJiAh aXNVbmRlZmluZWRPck51bGwoYXJnc1swXSkgJiYgIVY4V2ViR0xQcm9ncmFtOjpIYXNJbnN0YW5j ZShhcmdzWzBdKSkgewotICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOworICAgICAg ICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigwLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgICAg IHJldHVybiBub3RIYW5kbGVkQnlJbnRlcmNlcHRvcigpOwogICAgIH0KICAgICBXZWJHTFByb2dy YW0qIHByb2dyYW0gPSBWOFdlYkdMUHJvZ3JhbTo6SGFzSW5zdGFuY2UoYXJnc1swXSkgPyBWOFdl YkdMUHJvZ3JhbTo6dG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChhcmdzWzBd KSkgOiAwOwpAQCAtMzU3LDcgKzM1Nyw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFdlYkdM UmVuZGVyaW5nQ29udGV4dDo6Z2V0UHJvZ3JhbVBhcmFtZXRlckNhbGxiYWNrKGNvbnN0CiAgICAg RXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAgV2ViR0xSZW5kZXJpbmdDb250ZXh0KiBjb250ZXh0 ID0gVjhXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOwogICAg IGlmIChhcmdzLkxlbmd0aCgpID4gMCAmJiAhaXNVbmRlZmluZWRPck51bGwoYXJnc1swXSkgJiYg IVY4V2ViR0xQcm9ncmFtOjpIYXNJbnN0YW5jZShhcmdzWzBdKSkgewotICAgICAgICBWOFByb3h5 Ojp0aHJvd1R5cGVFcnJvcigpOworICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigwLCBh cmdzLkdldElzb2xhdGUoKSk7CiAgICAgICAgIHJldHVybiBub3RIYW5kbGVkQnlJbnRlcmNlcHRv cigpOwogICAgIH0KICAgICBXZWJHTFByb2dyYW0qIHByb2dyYW0gPSBWOFdlYkdMUHJvZ3JhbTo6 SGFzSW5zdGFuY2UoYXJnc1swXSkgPyBWOFdlYkdMUHJvZ3JhbTo6dG9OYXRpdmUodjg6OkhhbmRs ZTx2ODo6T2JqZWN0Pjo6Q2FzdChhcmdzWzBdKSkgOiAwOwpAQCAtMzg2LDcgKzM4Niw3IEBAIHY4 OjpIYW5kbGU8djg6OlZhbHVlPiBWOFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0U2hhZGVyUGFy YW1ldGVyQ2FsbGJhY2soY29uc3QKICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKICAgICBXZWJH TFJlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQgPSBWOFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6dG9O YXRpdmUoYXJncy5Ib2xkZXIoKSk7CiAgICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPiAwICYmICFpc1Vu ZGVmaW5lZE9yTnVsbChhcmdzWzBdKSAmJiAhVjhXZWJHTFNoYWRlcjo6SGFzSW5zdGFuY2UoYXJn c1swXSkpIHsKLSAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKKyAgICAgICAgVjhQ cm94eTo6dGhyb3dUeXBlRXJyb3IoMCwgYXJncy5HZXRJc29sYXRlKCkpOwogICAgICAgICByZXR1 cm4gbm90SGFuZGxlZEJ5SW50ZXJjZXB0b3IoKTsKICAgICB9CiAgICAgV2ViR0xTaGFkZXIqIHNo YWRlciA9IFY4V2ViR0xTaGFkZXI6Okhhc0luc3RhbmNlKGFyZ3NbMF0pID8gVjhXZWJHTFNoYWRl cjo6dG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChhcmdzWzBdKSkgOiAwOwpA QCAtNDI5LDEzICs0MjksMTMgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4V2ViR0xSZW5kZXJp bmdDb250ZXh0OjpnZXRVbmlmb3JtQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3UKICAgICBFeGNlcHRp b25Db2RlIGVjID0gMDsKICAgICBXZWJHTFJlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQgPSBWOFdl YkdMUmVuZGVyaW5nQ29udGV4dDo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7CiAgICAgaWYgKGFy Z3MuTGVuZ3RoKCkgPiAwICYmICFpc1VuZGVmaW5lZE9yTnVsbChhcmdzWzBdKSAmJiAhVjhXZWJH TFByb2dyYW06Okhhc0luc3RhbmNlKGFyZ3NbMF0pKSB7Ci0gICAgICAgIFY4UHJveHk6OnRocm93 VHlwZUVycm9yKCk7CisgICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9yKDAsIGFyZ3MuR2V0 SXNvbGF0ZSgpKTsKICAgICAgICAgcmV0dXJuIG5vdEhhbmRsZWRCeUludGVyY2VwdG9yKCk7CiAg ICAgfQogICAgIFdlYkdMUHJvZ3JhbSogcHJvZ3JhbSA9IFY4V2ViR0xQcm9ncmFtOjpIYXNJbnN0 YW5jZShhcmdzWzBdKSA/IFY4V2ViR0xQcm9ncmFtOjp0b05hdGl2ZSh2ODo6SGFuZGxlPHY4OjpP YmplY3Q+OjpDYXN0KGFyZ3NbMF0pKSA6IDA7CiAKICAgICBpZiAoYXJncy5MZW5ndGgoKSA+IDEg JiYgIWlzVW5kZWZpbmVkT3JOdWxsKGFyZ3NbMV0pICYmICFWOFdlYkdMVW5pZm9ybUxvY2F0aW9u OjpIYXNJbnN0YW5jZShhcmdzWzFdKSkgewotICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJv cigpOworICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigwLCBhcmdzLkdldElzb2xhdGUo KSk7CiAgICAgICAgIHJldHVybiBub3RIYW5kbGVkQnlJbnRlcmNlcHRvcigpOwogICAgIH0KICAg ICBib29sIG9rID0gZmFsc2U7CkBAIC01MDUsNyArNTA1LDcgQEAgc3RhdGljIHY4OjpIYW5kbGU8 djg6OlZhbHVlPiB2ZXJ0ZXhBdHRyaWJBbmRVbmlmb3JtSGVscGVyZihjb25zdCB2ODo6QXJndW1l bnRzJgogICAgICAgICBpbmRleCA9IHRvSW50MzIoYXJnc1swXSk7CiAgICAgZWxzZSB7CiAgICAg ICAgIGlmIChhcmdzLkxlbmd0aCgpID4gMCAmJiAhaXNVbmRlZmluZWRPck51bGwoYXJnc1swXSkg JiYgIVY4V2ViR0xVbmlmb3JtTG9jYXRpb246Okhhc0luc3RhbmNlKGFyZ3NbMF0pKSB7Ci0gICAg ICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOworICAgICAgICAgICAgVjhQcm94eTo6 dGhyb3dUeXBlRXJyb3IoMCwgYXJncy5HZXRJc29sYXRlKCkpOwogICAgICAgICAgICAgcmV0dXJu IG5vdEhhbmRsZWRCeUludGVyY2VwdG9yKCk7CiAgICAgICAgIH0KICAgICAgICAgbG9jYXRpb24g PSB0b1dlYkdMVW5pZm9ybUxvY2F0aW9uKGFyZ3NbMF0sIG9rKTsKQEAgLTUzNCw3ICs1MzQsNyBA QCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHZlcnRleEF0dHJpYkFuZFVuaWZvcm1IZWxw ZXJmKGNvbnN0IHY4OjpBcmd1bWVudHMmCiAgICAgfQogCiAgICAgaWYgKGFyZ3NbMV0uSXNFbXB0 eSgpIHx8ICFhcmdzWzFdLT5Jc0FycmF5KCkpIHsKLSAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBl RXJyb3IoKTsKKyAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoMCwgYXJncy5HZXRJc29s YXRlKCkpOwogICAgICAgICByZXR1cm4gbm90SGFuZGxlZEJ5SW50ZXJjZXB0b3IoKTsKICAgICB9 CiAgICAgdjg6OkhhbmRsZTx2ODo6QXJyYXk+IGFycmF5ID0KQEAgLTU4MSw3ICs1ODEsNyBAQCBz dGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHVuaWZvcm1IZWxwZXJpKGNvbnN0IHY4OjpBcmd1 bWVudHMmIGFyZ3MsCiAKICAgICBXZWJHTFJlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQgPSBWOFdl YkdMUmVuZGVyaW5nQ29udGV4dDo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7CiAgICAgaWYgKGFy Z3MuTGVuZ3RoKCkgPiAwICYmICFpc1VuZGVmaW5lZE9yTnVsbChhcmdzWzBdKSAmJiAhVjhXZWJH TFVuaWZvcm1Mb2NhdGlvbjo6SGFzSW5zdGFuY2UoYXJnc1swXSkpIHsKLSAgICAgICAgVjhQcm94 eTo6dGhyb3dUeXBlRXJyb3IoKTsKKyAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoMCwg YXJncy5HZXRJc29sYXRlKCkpOwogICAgICAgICByZXR1cm4gbm90SGFuZGxlZEJ5SW50ZXJjZXB0 b3IoKTsKICAgICB9CiAgICAgYm9vbCBvayA9IGZhbHNlOwpAQCAtNjA0LDcgKzYwNCw3IEBAIHN0 YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdW5pZm9ybUhlbHBlcmkoY29uc3Qgdjg6OkFyZ3Vt ZW50cyYgYXJncywKICAgICB9CiAKICAgICBpZiAoYXJnc1sxXS5Jc0VtcHR5KCkgfHwgIWFyZ3Nb MV0tPklzQXJyYXkoKSkgewotICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOworICAg ICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigwLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAg ICAgIHJldHVybiBub3RIYW5kbGVkQnlJbnRlcmNlcHRvcigpOwogICAgIH0KICAgICB2ODo6SGFu ZGxlPHY4OjpBcnJheT4gYXJyYXkgPQpAQCAtNjk2LDcgKzY5Niw3IEBAIHN0YXRpYyB2ODo6SGFu ZGxlPHY4OjpWYWx1ZT4gdW5pZm9ybU1hdHJpeEhlbHBlcihjb25zdCB2ODo6QXJndW1lbnRzJiBh cmdzLAogICAgIFdlYkdMUmVuZGVyaW5nQ29udGV4dCogY29udGV4dCA9IFY4V2ViR0xSZW5kZXJp bmdDb250ZXh0Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKIAogICAgIGlmIChhcmdzLkxlbmd0 aCgpID4gMCAmJiAhaXNVbmRlZmluZWRPck51bGwoYXJnc1swXSkgJiYgIVY4V2ViR0xVbmlmb3Jt TG9jYXRpb246Okhhc0luc3RhbmNlKGFyZ3NbMF0pKSB7Ci0gICAgICAgIFY4UHJveHk6OnRocm93 VHlwZUVycm9yKCk7CisgICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9yKDAsIGFyZ3MuR2V0 SXNvbGF0ZSgpKTsKICAgICAgICAgcmV0dXJuIG5vdEhhbmRsZWRCeUludGVyY2VwdG9yKCk7CiAg ICAgfQogICAgIGJvb2wgb2sgPSBmYWxzZTsKQEAgLTcxOSw3ICs3MTksNyBAQCBzdGF0aWMgdjg6 OkhhbmRsZTx2ODo6VmFsdWU+IHVuaWZvcm1NYXRyaXhIZWxwZXIoY29uc3Qgdjg6OkFyZ3VtZW50 cyYgYXJncywKICAgICB9CiAKICAgICBpZiAoYXJnc1syXS5Jc0VtcHR5KCkgfHwgIWFyZ3NbMl0t PklzQXJyYXkoKSkgewotICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOworICAgICAg ICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigwLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgICAg IHJldHVybiBub3RIYW5kbGVkQnlJbnRlcmNlcHRvcigpOwogICAgIH0KICAgICB2ODo6SGFuZGxl PHY4OjpBcnJheT4gYXJyYXkgPQo= 143217 2012-05-22 00:50:57 -0700 2012-05-22 01:37:52 -0700 rebased patch for landing bug-87070-20120522165055.patch text/plain 14941 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3OTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjQ4NGIzNDRkY2I2Mzky M2NkZmM2MDFmNTJhMGYzNmVkY2RlMTQyYi4uMDUxNDI1M2MyYzg3MGM4M2FlMTY2NTZhZjRiYTVk NzM4MTM3ZWY4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEyLTA1LTIxICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIEFkZCBhbiBv cHRpb25hbCAnaXNvbGF0ZScgYXJndW1lbnQgdG8gdGhyb3dUeXBlRXJyb3IoKQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODcwNzAKKworICAgICAgICBS ZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIFRoZSBvYmplY3RpdmUgaXMgdG8gcGFz cyBJc29sYXRlIGFyb3VuZCBpbiBWOCBiaW5kaW5ncy4KKyAgICAgICAgVGhpcyBwYXRjaCBhZGRz IGFuIG9wdGlvbmFsICdpc29sYXRlJyBhcmd1bWVudCB0byB0aHJvd1R5cGVFcnJvcigpLAorICAg ICAgICBhbmQgcGFzc2VzIElzb2xhdGUgdG8gdGhyb3dUeXBlRXJyb3IoKXMuIEluIGEgZm9sbG93 aW5nIHBhdGNoLAorICAgICAgICBJJ2xsIHBhc3MgSXNvbGF0ZSB0byBhbGwgdGhyb3dUeXBlRXJy b3IoIm1lc3NhZ2UiKXMuCisKKyAgICAgICAgTm8gdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlv ci4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtOgorICAg ICAgICAoR2VuZXJhdGVOb3JtYWxBdHRyU2V0dGVyKToKKyAgICAgICAgKEdlbmVyYXRlT3Zlcmxv YWRlZEZ1bmN0aW9uQ2FsbGJhY2spOgorICAgICAgICAoR2VuZXJhdGVQYXJhbWV0ZXJzQ2hlY2sp OgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwOgorICAg ICAgICAoV2ViQ29yZTo6VGVzdE9ialY4SW50ZXJuYWw6Om92ZXJsb2FkZWRNZXRob2RDYWxsYmFj ayk6CisgICAgICAgIChXZWJDb3JlOjpUZXN0T2JqVjhJbnRlcm5hbDo6b3ZlcmxvYWRlZE1ldGhv ZDFDYWxsYmFjayk6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhQcm94eS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcik6CisgICAgICAgICogYmluZGluZ3Mv djgvVjhQcm94eS5oOgorICAgICAgICAoVjhQcm94eSk6CisgICAgICAgICogYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tLmg6CisgICAgICAgIChXZWJDb3JlOjpjb25z dHJ1Y3RXZWJHTEFycmF5KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhEYXRhVmll d0N1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOERhdGFWaWV3Ojpjb25zdHJ1Y3RvckNh bGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhTVkdMZW5ndGhDdXN0b20u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhTVkdMZW5ndGg6OnZhbHVlQWNjZXNzb3JTZXR0ZXIp OgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOFdlYkdMUmVuZGVyaW5nQ29udGV4dEN1 c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0 QXR0YWNoZWRTaGFkZXJzQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6VjhXZWJHTFJlbmRl cmluZ0NvbnRleHQ6OmdldFByb2dyYW1QYXJhbWV0ZXJDYWxsYmFjayk6CisgICAgICAgIChXZWJD b3JlOjpWOFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0U2hhZGVyUGFyYW1ldGVyQ2FsbGJhY2sp OgorICAgICAgICAoV2ViQ29yZTo6VjhXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmdldFVuaWZvcm1D YWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjp2ZXJ0ZXhBdHRyaWJBbmRVbmlmb3JtSGVscGVy Zik6CisgICAgICAgIChXZWJDb3JlOjp1bmlmb3JtSGVscGVyaSk6CisgICAgICAgIChXZWJDb3Jl Ojp1bmlmb3JtTWF0cml4SGVscGVyKToKKwogMjAxMi0wNS0yMiAgS2VudGFybyBIYXJhICA8aGFy YWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1Y4XSBzZXRET01FeGNlcHRpb24oKSBzaG91 bGQgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbSBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCmluZGV4IGE5N2E0MzRkN2M3ODcy YmE4ZWE2ZjcxNTg4YzcxMTMyYTE5MTk5OWEuLmYzYmVkODM5MWQ0ZTg1NmU2ZjgyZDQxZDFkMDhh OWE0NGUxMjk5ZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvclY4LnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvclY4LnBtCkBAIC0xMDU0LDcgKzEwNTQsNyBAQCBzdWIgR2VuZXJhdGVOb3Jt YWxBdHRyU2V0dGVyCiAgICAgICAgIG15ICRhcmdUeXBlID0gR2V0VHlwZUZyb21TaWduYXR1cmUo JGF0dHJpYnV0ZS0+c2lnbmF0dXJlKTsKICAgICAgICAgaWYgKElzV3JhcHBlclR5cGUoJGFyZ1R5 cGUpKSB7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgIGlmICghaXNV bmRlZmluZWRPck51bGwodmFsdWUpICYmICFWOCR7YXJnVHlwZX06Okhhc0luc3RhbmNlKHZhbHVl KSkge1xuIik7Ci0gICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgICAgICBW OFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpO1xuIik7CisgICAgICAgICAgICBwdXNoKEBpbXBsQ29u dGVudERlY2xzLCAiICAgICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigwLCBpbmZvLkdldElz b2xhdGUoKSk7XG4iKTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAg ICAgIHJldHVybjtcbiIpOwogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAg ICB9XG4iKTsKICAgICAgICAgfQpAQCAtMTM1NCw3ICsxMzU0LDcgQEAgRU5ECiAgICAgICAgIHB1 c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgICAgIHJldHVybiAke25hbWV9JG92ZXJsb2FkLT57 b3ZlcmxvYWRJbmRleH1DYWxsYmFjayhhcmdzKTtcbiIpOwogICAgIH0KICAgICBwdXNoKEBpbXBs Q29udGVudERlY2xzLCA8PEVORCk7Ci0gICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKKyAg ICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigwLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgcmV0 dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpOwogRU5ECiAgICAgcHVzaChAaW1wbENvbnRlbnRE ZWNscywgIn1cblxuIik7CkBAIC0xNjYzLDcgKzE2NjMsNyBAQCBzdWIgR2VuZXJhdGVQYXJhbWV0 ZXJzQ2hlY2sKICAgICAgICAgICAgICAgICBteSAkYXJnVHlwZSA9IEdldFR5cGVGcm9tU2lnbmF0 dXJlKCRwYXJhbWV0ZXIpOwogICAgICAgICAgICAgICAgIGlmIChJc1dyYXBwZXJUeXBlKCRhcmdU eXBlKSkgewogICAgICAgICAgICAgICAgICAgICAkcGFyYW1ldGVyQ2hlY2tTdHJpbmcgLj0gIiAg ICBpZiAoYXJncy5MZW5ndGgoKSA+ICRwYXJhbUluZGV4ICYmICFpc1VuZGVmaW5lZE9yTnVsbCgk YXJnVmFsdWUpICYmICFWOCR7YXJnVHlwZX06Okhhc0luc3RhbmNlKCRhcmdWYWx1ZSkpIHtcbiI7 Ci0gICAgICAgICAgICAgICAgICAgICRwYXJhbWV0ZXJDaGVja1N0cmluZyAuPSAiICAgICAgICBW OFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpO1xuIjsKKyAgICAgICAgICAgICAgICAgICAgJHBhcmFt ZXRlckNoZWNrU3RyaW5nIC49ICIgICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9yKDAsIGFy Z3MuR2V0SXNvbGF0ZSgpKTtcbiI7CiAgICAgICAgICAgICAgICAgICAgICRwYXJhbWV0ZXJDaGVj a1N0cmluZyAuPSAiICAgICAgICByZXR1cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7XG4iOwog ICAgICAgICAgICAgICAgICAgICAkcGFyYW1ldGVyQ2hlY2tTdHJpbmcgLj0gIiAgICB9XG4iOwog ICAgICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy90ZXN0L1Y4L1Y4VGVzdE9iai5jcHAKaW5kZXggNTA5MDQ0ZjM0MTgxMjBiZWJhNThiNzkz OTY2ODBjMGFlNTcxNmM3Ni4uNmVjM2JiMWFjZjU3ZWM5MjJlMmM0OGRiZGYxNjA2YzM1NjViZTk0 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4 VGVzdE9iai5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4 L1Y4VGVzdE9iai5jcHAKQEAgLTE4MTMsNyArMTgxMyw3IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gb3ZlcmxvYWRlZE1ldGhvZENhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFy Z3MpCiAgICAgICAgIHJldHVybiBvdmVybG9hZGVkTWV0aG9kNkNhbGxiYWNrKGFyZ3MpOwogICAg IGlmICgoYXJncy5MZW5ndGgoKSA9PSAxICYmIChhcmdzWzBdLT5Jc051bGwoKSB8fCBhcmdzWzBd LT5Jc0FycmF5KCkpKSkKICAgICAgICAgcmV0dXJuIG92ZXJsb2FkZWRNZXRob2Q3Q2FsbGJhY2so YXJncyk7Ci0gICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKKyAgICBWOFByb3h5Ojp0aHJv d1R5cGVFcnJvcigwLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgcmV0dXJuIHY4OjpIYW5kbGU8 djg6OlZhbHVlPigpOwogfQogCkBAIC0xODcxLDcgKzE4NzEsNyBAQCBzdGF0aWMgdjg6OkhhbmRs ZTx2ODo6VmFsdWU+IG92ZXJsb2FkZWRNZXRob2QxQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50 cyYgYXJncwogICAgICAgICByZXR1cm4gb3ZlcmxvYWRlZE1ldGhvZDExQ2FsbGJhY2soYXJncyk7 CiAgICAgaWYgKChhcmdzLkxlbmd0aCgpID09IDEgJiYgKGFyZ3NbMF0tPklzTnVsbCgpIHx8IGFy Z3NbMF0tPklzVW5kZWZpbmVkKCkgfHwgYXJnc1swXS0+SXNTdHJpbmcoKSB8fCBhcmdzWzBdLT5J c09iamVjdCgpKSkpCiAgICAgICAgIHJldHVybiBvdmVybG9hZGVkTWV0aG9kMTJDYWxsYmFjayhh cmdzKTsKLSAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOworICAgIFY4UHJveHk6OnRocm93 VHlwZUVycm9yKDAsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICByZXR1cm4gdjg6OkhhbmRsZTx2 ODo6VmFsdWU+KCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4UHJveHkuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAKaW5k ZXggNjdkNTI4Zjc2OTQ2ZmMxZGNmMzA2NWUzMTJmMjEwZWIwYjJjNzJkYy4uYzUzYjdhMDJiNTE2 Nzc2YjI5YTI4ZjZhODZjYjU0N2MzNDM1OTc3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvVjhQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv VjhQcm94eS5jcHAKQEAgLTYzMSw5ICs2MzEsOSBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhQ cm94eTo6dGhyb3dFcnJvcihFcnJvclR5cGUgdHlwZSwgY29uc3QgY2hhciogbWVzc2FnZSwgdgog ICAgIH0KIH0KIAotdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4UHJveHk6OnRocm93VHlwZUVycm9y KGNvbnN0IGNoYXIqIG1lc3NhZ2UpCit2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhQcm94eTo6dGhy b3dUeXBlRXJyb3IoY29uc3QgY2hhciogbWVzc2FnZSwgdjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7 Ci0gICAgcmV0dXJuIHRocm93RXJyb3IoVHlwZUVycm9yLCAobWVzc2FnZSA/IG1lc3NhZ2UgOiAi VHlwZSBlcnJvciIpKTsKKyAgICByZXR1cm4gdGhyb3dFcnJvcihUeXBlRXJyb3IsIChtZXNzYWdl ID8gbWVzc2FnZSA6ICJUeXBlIGVycm9yIiksIGlzb2xhdGUpOwogfQogCiB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gVjhQcm94eTo6dGhyb3dOb3RFbm91Z2hBcmd1bWVudHNFcnJvcih2ODo6SXNvbGF0 ZSogaXNvbGF0ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJv eHkuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuaAppbmRleCAxNzE4YmM4 N2RhNGI3MmE3ZDhjMTAyNGU0N2ZhNzkxZDMxNmM0ZDc5Li5mYmY5NTk0OTVhZjQ3Y2Y1MzRmZTQw MjY1YzU2ZWNmYjE0YmQxNjJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9WOFByb3h5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCkBA IC0yNDAsNyArMjQwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBzdGF0aWMgdjg6 OkhhbmRsZTx2ODo6VmFsdWU+IHRocm93RXJyb3IoRXJyb3JUeXBlLCBjb25zdCBjaGFyKiBtZXNz YWdlLCB2ODo6SXNvbGF0ZSogPSAwKTsKIAogICAgICAgICAvLyBIZWxwZXJzIGZvciB0aHJvd2lu ZyBzeW50YXggYW5kIHR5cGUgZXJyb3JzIHdpdGggcHJlZGVmaW5lZCBtZXNzYWdlcy4KLSAgICAg ICAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB0aHJvd1R5cGVFcnJvcihjb25zdCBjaGFy KiA9IDApOworICAgICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHRocm93VHlwZUVy cm9yKGNvbnN0IGNoYXIqID0gMCwgdjg6Oklzb2xhdGUqID0gMCk7CiAgICAgICAgIHN0YXRpYyB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdGhyb3dOb3RFbm91Z2hBcmd1bWVudHNFcnJvcih2ODo6SXNv bGF0ZSopOwogCiAgICAgICAgIHY4OjpMb2NhbDx2ODo6Q29udGV4dD4gY29udGV4dCgpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4QXJyYXlCdWZmZXJW aWV3Q3VzdG9tLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhBcnJheUJ1 ZmZlclZpZXdDdXN0b20uaAppbmRleCAyMzk1ZjI0NzAzMWFhMmQ4ZWQ3MjZjYTk1NTJhOGY4YWUy MmI2ZDgzLi5hMmZkNjlkY2NmODdjYzcwMDc5YWU2NGZiZDRkZDA5MjliMWY5ZjNhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhBcnJheUJ1ZmZlclZpZXdD dXN0b20uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhBcnJheUJ1 ZmZlclZpZXdDdXN0b20uaApAQCAtMTM4LDggKzEzOCw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVl PiBjb25zdHJ1Y3RXZWJHTEFycmF5KGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MsIFdyYXBwZXJU eXBlCiAKICAgICBpZiAoYXJnc1swXS0+SXNOdWxsKCkpIHsKICAgICAgICAgLy8gSW52YWxpZCBm aXJzdCBhcmd1bWVudAotICAgICAgICAvLyBGSVhNRTogdXNlIGZvcnRoY29taW5nIFY4UHJveHk6 OnRocm93VHlwZUVycm9yKCkuCi0gICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd1R5cGVFcnJv cigpOworICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoMCwgYXJncy5HZXRJ c29sYXRlKCkpOwogICAgIH0KIAogICAgIC8vIFNlZSB3aGV0aGVyIHRoZSBmaXJzdCBhcmd1bWVu dCBpcyBhIEFycmF5QnVmZmVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvY3VzdG9tL1Y4RGF0YVZpZXdDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvY3VzdG9tL1Y4RGF0YVZpZXdDdXN0b20uY3BwCmluZGV4IDk1NDE4OGUzYjlhNGUxNjdhZjk3 YTUyZGRkZjA4NzBmNzJkMTM4MDAuLmYxYzlkMjdlMjcxZDlkOGQ5MjVmMjVjNjU4YzkxOGQ1YmJl ZjQ3MzAgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERh dGFWaWV3Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20v VjhEYXRhVmlld0N1c3RvbS5jcHAKQEAgLTUzLDcgKzUzLDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFs dWU+IFY4RGF0YVZpZXc6OmNvbnN0cnVjdG9yQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYg YXJncykKICAgICAgICAgcmV0dXJuIGFyZ3MuSG9sZGVyKCk7CiAgICAgfQogICAgIGlmIChhcmdz WzBdLT5Jc051bGwoKSB8fCAhVjhBcnJheUJ1ZmZlcjo6SGFzSW5zdGFuY2UoYXJnc1swXSkpCi0g ICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOworICAgICAgICByZXR1cm4g VjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoMCwgYXJncy5HZXRJc29sYXRlKCkpOwogICAgIHJldHVy biBjb25zdHJ1Y3RXZWJHTEFycmF5V2l0aEFycmF5QnVmZmVyQXJndW1lbnQ8RGF0YVZpZXcsIGNo YXI+KGFyZ3MsICZpbmZvLCB2ODo6a0V4dGVybmFsQnl0ZUFycmF5LCBmYWxzZSk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFNWR0xlbmd0aEN1 c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhTVkdMZW5ndGhD dXN0b20uY3BwCmluZGV4IDEwYTA3MzVkYTQ0NjRlYzk0YjVjNzEyN2ExNzcxYjZjMGY3OWI1M2Mu LmY3ZGE5YmZmMGNhYmUyMTZlMTY0MzBjZjIwMDMwMGRkNWQ0MTA3NmEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFNWR0xlbmd0aEN1c3RvbS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4U1ZHTGVuZ3RoQ3VzdG9tLmNw cApAQCAtNjYsNyArNjYsNyBAQCB2b2lkIFY4U1ZHTGVuZ3RoOjp2YWx1ZUFjY2Vzc29yU2V0dGVy KHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLCB2ODo6TG9jYWw8djg6OgogICAgIH0KIAogICAg IGlmICghaXNVbmRlZmluZWRPck51bGwodmFsdWUpICYmICF2YWx1ZS0+SXNOdW1iZXIoKSAmJiAh dmFsdWUtPklzQm9vbGVhbigpKSB7Ci0gICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCk7 CisgICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9yKDAsIGluZm8uR2V0SXNvbGF0ZSgpKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4V2ViR0xSZW5kZXJpbmdDb250ZXh0Q3VzdG9tLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFdlYkdMUmVuZGVyaW5nQ29udGV4dEN1c3Rv bS5jcHAKaW5kZXggZWU5ZDFhN2M0NjVjZjgxYzk4NzliZDMzNGY4NWFiNGMzMWZiMDJiMy4uMDcy ZGFlYTdlNDExMzQ0OGI3MTRkZDI4M2EyZTM4MWQ3ZTkxOGU3MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4V2ViR0xSZW5kZXJpbmdDb250ZXh0Q3VzdG9t LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhXZWJHTFJlbmRl cmluZ0NvbnRleHRDdXN0b20uY3BwCkBAIC0yNzQsNyArMjc0LDcgQEAgdjg6OkhhbmRsZTx2ODo6 VmFsdWU+IFY4V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpnZXRBdHRhY2hlZFNoYWRlcnNDYWxsYmFj ayhjb25zdAogICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgIFdlYkdMUmVuZGVyaW5nQ29u dGV4dCogY29udGV4dCA9IFY4V2ViR0xSZW5kZXJpbmdDb250ZXh0Ojp0b05hdGl2ZShhcmdzLkhv bGRlcigpKTsKICAgICBpZiAoYXJncy5MZW5ndGgoKSA+IDAgJiYgIWlzVW5kZWZpbmVkT3JOdWxs KGFyZ3NbMF0pICYmICFWOFdlYkdMUHJvZ3JhbTo6SGFzSW5zdGFuY2UoYXJnc1swXSkpCi0gICAg ICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOworICAgICAgICByZXR1cm4gVjhQ cm94eTo6dGhyb3dUeXBlRXJyb3IoMCwgYXJncy5HZXRJc29sYXRlKCkpOwogICAgIFdlYkdMUHJv Z3JhbSogcHJvZ3JhbSA9IFY4V2ViR0xQcm9ncmFtOjpIYXNJbnN0YW5jZShhcmdzWzBdKSA/IFY4 V2ViR0xQcm9ncmFtOjp0b05hdGl2ZSh2ODo6SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0KGFyZ3Nb MF0pKSA6IDA7CiAgICAgVmVjdG9yPFJlZlB0cjxXZWJHTFNoYWRlcj4gPiBzaGFkZXJzOwogICAg IGJvb2wgc3VjY2VlZCA9IGNvbnRleHQtPmdldEF0dGFjaGVkU2hhZGVycyhwcm9ncmFtLCBzaGFk ZXJzLCBlYyk7CkBAIC0zNTUsNyArMzU1LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4V2Vi R0xSZW5kZXJpbmdDb250ZXh0OjpnZXRQcm9ncmFtUGFyYW1ldGVyQ2FsbGJhY2soY29uc3QKICAg ICBFeGNlcHRpb25Db2RlIGVjID0gMDsKICAgICBXZWJHTFJlbmRlcmluZ0NvbnRleHQqIGNvbnRl eHQgPSBWOFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7CiAg ICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPiAwICYmICFpc1VuZGVmaW5lZE9yTnVsbChhcmdzWzBdKSAm JiAhVjhXZWJHTFByb2dyYW06Okhhc0luc3RhbmNlKGFyZ3NbMF0pKQotICAgICAgICByZXR1cm4g VjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKKyAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRocm93 VHlwZUVycm9yKDAsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICBXZWJHTFByb2dyYW0qIHByb2dy YW0gPSBWOFdlYkdMUHJvZ3JhbTo6SGFzSW5zdGFuY2UoYXJnc1swXSkgPyBWOFdlYkdMUHJvZ3Jh bTo6dG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChhcmdzWzBdKSkgOiAwOwog ICAgIHVuc2lnbmVkIHBuYW1lID0gdG9JbnQzMihhcmdzWzFdKTsKICAgICBXZWJHTEdldEluZm8g aW5mbyA9IGNvbnRleHQtPmdldFByb2dyYW1QYXJhbWV0ZXIocHJvZ3JhbSwgcG5hbWUsIGVjKTsK QEAgLTM4Miw3ICszODIsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhXZWJHTFJlbmRlcmlu Z0NvbnRleHQ6OmdldFNoYWRlclBhcmFtZXRlckNhbGxiYWNrKGNvbnN0CiAgICAgRXhjZXB0aW9u Q29kZSBlYyA9IDA7CiAgICAgV2ViR0xSZW5kZXJpbmdDb250ZXh0KiBjb250ZXh0ID0gVjhXZWJH TFJlbmRlcmluZ0NvbnRleHQ6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOwogICAgIGlmIChhcmdz Lkxlbmd0aCgpID4gMCAmJiAhaXNVbmRlZmluZWRPck51bGwoYXJnc1swXSkgJiYgIVY4V2ViR0xT aGFkZXI6Okhhc0luc3RhbmNlKGFyZ3NbMF0pKQotICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhy b3dUeXBlRXJyb3IoKTsKKyAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRocm93VHlwZUVycm9yKDAs IGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICBXZWJHTFNoYWRlciogc2hhZGVyID0gVjhXZWJHTFNo YWRlcjo6SGFzSW5zdGFuY2UoYXJnc1swXSkgPyBWOFdlYkdMU2hhZGVyOjp0b05hdGl2ZSh2ODo6 SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0KGFyZ3NbMF0pKSA6IDA7CiAgICAgdW5zaWduZWQgcG5h bWUgPSB0b0ludDMyKGFyZ3NbMV0pOwogICAgIFdlYkdMR2V0SW5mbyBpbmZvID0gY29udGV4dC0+ Z2V0U2hhZGVyUGFyYW1ldGVyKHNoYWRlciwgcG5hbWUsIGVjKTsKQEAgLTQyMywxMSArNDIzLDEx IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0VW5p Zm9ybUNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1CiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAg ICAgV2ViR0xSZW5kZXJpbmdDb250ZXh0KiBjb250ZXh0ID0gVjhXZWJHTFJlbmRlcmluZ0NvbnRl eHQ6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOwogICAgIGlmIChhcmdzLkxlbmd0aCgpID4gMCAm JiAhaXNVbmRlZmluZWRPck51bGwoYXJnc1swXSkgJiYgIVY4V2ViR0xQcm9ncmFtOjpIYXNJbnN0 YW5jZShhcmdzWzBdKSkKLSAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCk7 CisgICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigwLCBhcmdzLkdldElzb2xh dGUoKSk7CiAgICAgV2ViR0xQcm9ncmFtKiBwcm9ncmFtID0gVjhXZWJHTFByb2dyYW06Okhhc0lu c3RhbmNlKGFyZ3NbMF0pID8gVjhXZWJHTFByb2dyYW06OnRvTmF0aXZlKHY4OjpIYW5kbGU8djg6 Ok9iamVjdD46OkNhc3QoYXJnc1swXSkpIDogMDsKIAogICAgIGlmIChhcmdzLkxlbmd0aCgpID4g MSAmJiAhaXNVbmRlZmluZWRPck51bGwoYXJnc1sxXSkgJiYgIVY4V2ViR0xVbmlmb3JtTG9jYXRp b246Okhhc0luc3RhbmNlKGFyZ3NbMV0pKQotICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dU eXBlRXJyb3IoKTsKKyAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRocm93VHlwZUVycm9yKDAsIGFy Z3MuR2V0SXNvbGF0ZSgpKTsKICAgICBib29sIG9rID0gZmFsc2U7CiAgICAgV2ViR0xVbmlmb3Jt TG9jYXRpb24qIGxvY2F0aW9uID0gdG9XZWJHTFVuaWZvcm1Mb2NhdGlvbihhcmdzWzFdLCBvayk7 CiAKQEAgLTQ5NSw3ICs0OTUsNyBAQCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHZlcnRl eEF0dHJpYkFuZFVuaWZvcm1IZWxwZXJmKGNvbnN0IHY4OjpBcmd1bWVudHMmCiAgICAgICAgIGlu ZGV4ID0gdG9JbnQzMihhcmdzWzBdKTsKICAgICBlbHNlIHsKICAgICAgICAgaWYgKGFyZ3MuTGVu Z3RoKCkgPiAwICYmICFpc1VuZGVmaW5lZE9yTnVsbChhcmdzWzBdKSAmJiAhVjhXZWJHTFVuaWZv cm1Mb2NhdGlvbjo6SGFzSW5zdGFuY2UoYXJnc1swXSkpCi0gICAgICAgICAgICByZXR1cm4gVjhQ cm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKKyAgICAgICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJv d1R5cGVFcnJvcigwLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgICAgIGxvY2F0aW9uID0gdG9X ZWJHTFVuaWZvcm1Mb2NhdGlvbihhcmdzWzBdLCBvayk7CiAgICAgfQogCkBAIC01MjIsNyArNTIy LDcgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2ZXJ0ZXhBdHRyaWJBbmRVbmlmb3Jt SGVscGVyZihjb25zdCB2ODo6QXJndW1lbnRzJgogICAgIH0KIAogICAgIGlmIChhcmdzWzFdLklz RW1wdHkoKSB8fCAhYXJnc1sxXS0+SXNBcnJheSgpKQotICAgICAgICByZXR1cm4gVjhQcm94eTo6 dGhyb3dUeXBlRXJyb3IoKTsKKyAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRocm93VHlwZUVycm9y KDAsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICB2ODo6SGFuZGxlPHY4OjpBcnJheT4gYXJyYXkg PQogICAgICAgdjg6OkxvY2FsPHY4OjpBcnJheT46OkNhc3QoYXJnc1sxXSk7CiAgICAgdWludDMy X3QgbGVuID0gYXJyYXktPkxlbmd0aCgpOwpAQCAtNTY3LDcgKzU2Nyw3IEBAIHN0YXRpYyB2ODo6 SGFuZGxlPHY4OjpWYWx1ZT4gdW5pZm9ybUhlbHBlcmkoY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJn cywKIAogICAgIFdlYkdMUmVuZGVyaW5nQ29udGV4dCogY29udGV4dCA9IFY4V2ViR0xSZW5kZXJp bmdDb250ZXh0Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKICAgICBpZiAoYXJncy5MZW5ndGgo KSA+IDAgJiYgIWlzVW5kZWZpbmVkT3JOdWxsKGFyZ3NbMF0pICYmICFWOFdlYkdMVW5pZm9ybUxv Y2F0aW9uOjpIYXNJbnN0YW5jZShhcmdzWzBdKSkKLSAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRo cm93VHlwZUVycm9yKCk7CisgICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigw LCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgYm9vbCBvayA9IGZhbHNlOwogICAgIFdlYkdMVW5p Zm9ybUxvY2F0aW9uKiBsb2NhdGlvbiA9IHRvV2ViR0xVbmlmb3JtTG9jYXRpb24oYXJnc1swXSwg b2spOwogCkBAIC01ODgsNyArNTg4LDcgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB1 bmlmb3JtSGVscGVyaShjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzLAogICAgIH0KIAogICAgIGlm IChhcmdzWzFdLklzRW1wdHkoKSB8fCAhYXJnc1sxXS0+SXNBcnJheSgpKQotICAgICAgICByZXR1 cm4gVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKKyAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRo cm93VHlwZUVycm9yKDAsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICB2ODo6SGFuZGxlPHY4OjpB cnJheT4gYXJyYXkgPQogICAgICAgdjg6OkxvY2FsPHY4OjpBcnJheT46OkNhc3QoYXJnc1sxXSk7 CiAgICAgdWludDMyX3QgbGVuID0gYXJyYXktPkxlbmd0aCgpOwpAQCAtNjc4LDcgKzY3OCw3IEBA IHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdW5pZm9ybU1hdHJpeEhlbHBlcihjb25zdCB2 ODo6QXJndW1lbnRzJiBhcmdzLAogICAgIFdlYkdMUmVuZGVyaW5nQ29udGV4dCogY29udGV4dCA9 IFY4V2ViR0xSZW5kZXJpbmdDb250ZXh0Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKIAogICAg IGlmIChhcmdzLkxlbmd0aCgpID4gMCAmJiAhaXNVbmRlZmluZWRPck51bGwoYXJnc1swXSkgJiYg IVY4V2ViR0xVbmlmb3JtTG9jYXRpb246Okhhc0luc3RhbmNlKGFyZ3NbMF0pKQotICAgICAgICBy ZXR1cm4gVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKKyAgICAgICAgcmV0dXJuIFY4UHJveHk6 OnRocm93VHlwZUVycm9yKDAsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICBib29sIG9rID0gZmFs c2U7CiAgICAgV2ViR0xVbmlmb3JtTG9jYXRpb24qIGxvY2F0aW9uID0gdG9XZWJHTFVuaWZvcm1M b2NhdGlvbihhcmdzWzBdLCBvayk7CiAgICAgCkBAIC02OTksNyArNjk5LDcgQEAgc3RhdGljIHY4 OjpIYW5kbGU8djg6OlZhbHVlPiB1bmlmb3JtTWF0cml4SGVscGVyKGNvbnN0IHY4OjpBcmd1bWVu dHMmIGFyZ3MsCiAgICAgfQogCiAgICAgaWYgKGFyZ3NbMl0uSXNFbXB0eSgpIHx8ICFhcmdzWzJd LT5Jc0FycmF5KCkpCi0gICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOwor ICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoMCwgYXJncy5HZXRJc29sYXRl KCkpOwogICAgIHY4OjpIYW5kbGU8djg6OkFycmF5PiBhcnJheSA9CiAgICAgICB2ODo6TG9jYWw8 djg6OkFycmF5Pjo6Q2FzdChhcmdzWzJdKTsKICAgICB1aW50MzJfdCBsZW4gPSBhcnJheS0+TGVu Z3RoKCk7Cg==