170888 2017-04-16 12:24:30 -0700 test262: test262/test/built-ins/isNaN/toprimitive-not-callable-throws.js 2017-04-16 13:20:16 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck joepeck buildbot commit-queue joepeck keith_miller mark.lam msaboff saam oldest_to_newest 1297784 0 joepeck 2017-04-16 12:24:30 -0700 test262/test/built-ins/isNaN/toprimitive-not-callable-throws.js Test: isNaN( {[Symbol.toPrimitive]: 1} ) Expected: Throw TypeError, Symbol.toPrimitive must be a function, undefined, or null Actual: true Notes: - Firefox: TypeError: can't convert v to number: its [Symbol.toPrimitive] property is not a function - Chrome: TypeError: number is not a function Spec: https://tc39.github.io/ecma262/#sec-toprimitive 7.1.1 ToPrimitive ( input [ , PreferredType ] ) > 1. Assert: input is an ECMAScript language value. > 2. If Type(input) is Object, then > a. If PreferredType was not passed, let hint be "default". > b. Else if PreferredType is hint String, let hint be "string". > c. Else PreferredType is hint Number, let hint be "number". > d. Let exoticToPrim be ? GetMethod(input, @@toPrimitive). > e. If exoticToPrim is not undefined, then > ... https://tc39.github.io/ecma262/#sec-getmethod 7.3.9 GetMethod ( V, P ) > 1. Assert: IsPropertyKey(P) is true. > 2. Let func be ? GetV(V, P). > 3. If func is either undefined or null, return undefined. > 4. If IsCallable(func) is false, throw a TypeError exception. > 5. Return func. The key part here being GetMethod(..., @@toPrimitive) should throw a TypeError if the property is not callable (undefined / null handled earlier). 1297785 1 307234 joepeck 2017-04-16 12:28:07 -0700 Created attachment 307234 [PATCH] Proposed Fix 1297794 2 307234 saam 2017-04-16 13:01:50 -0700 Comment on attachment 307234 [PATCH] Proposed Fix r=me 1297799 3 307234 commit-queue 2017-04-16 13:20:15 -0700 Comment on attachment 307234 [PATCH] Proposed Fix Clearing flags on attachment: 307234 Committed r215402: <http://trac.webkit.org/changeset/215402> 1297800 4 commit-queue 2017-04-16 13:20:16 -0700 All reviewed patches have been landed. Closing bug. 307234 2017-04-16 12:28:07 -0700 2017-04-16 13:20:15 -0700 [PATCH] Proposed Fix primitive-1.patch text/plain 14592 joepeck ZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg MjQ5YjA0ZjlhYTUuLjc4ZTFmYTkyN2U3IDEwMDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5nZUxvZwor KysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE3LTA0LTE2ICBKb3Nl cGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgdGVzdDI2MjogdGVz dDI2Mi90ZXN0L2J1aWx0LWlucy9pc05hTi90b3ByaW1pdGl2ZS1ub3QtY2FsbGFibGUtdGhyb3dz LmpzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzA4 ODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHN0 cmVzcy9jb21wdXRlZC1hY2Nlc3Nvci5qczoKKyAgICAgICAgKiBzdHJlc3MvZXZhbC1pbi1hcnJv dy1mdW5jdGlvbi5qczoKKyAgICAgICAgKiBzdHJlc3MvcmVzdC1lbGVtZW50cy5qczoKKyAgICAg ICAgKiBzdHJlc3Mvc3RyaW5nLW9iamVjdC1kZWZpbmUtb3duLXByb3BlcnR5LmpzOgorICAgICAg ICBSZW1vdmUgdW51c2VkIHNob3VsZFRocm93LgorCisgICAgICAgICogc3RyZXNzL3N5bWJvbC10 b3ByaW1pdGl2ZS1lcnJvcnMuanM6IEFkZGVkLgorICAgICAgICBDaGVjayBmb3IgVG9QcmltaXRp dmUgVHlwZUVycm9ycy4KKworICAgICAgICAqIHRlc3QyNjIueWFtbDoKKworMjAxNy0wNC0xNiAg Sm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIHRlc3QyNjI6 IHRlc3QyNjIvdGVzdC9idWlsdC1pbnMvRGF0ZS9wcm90b3R5cGUvU3ltYm9sLnRvUHJpbWl0aXZl L25hbWUuanMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE3MDg4NAogCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9jb21wdXRlZC1hY2Nlc3Nvci5q cyBiL0pTVGVzdHMvc3RyZXNzL2NvbXB1dGVkLWFjY2Vzc29yLmpzCmluZGV4IDZlZjkyM2RiMzg5 Li44ZjUwYTYxNTkzNCAxMDA2NDQKLS0tIGEvSlNUZXN0cy9zdHJlc3MvY29tcHV0ZWQtYWNjZXNz b3IuanMKKysrIGIvSlNUZXN0cy9zdHJlc3MvY29tcHV0ZWQtYWNjZXNzb3IuanMKQEAgLTMsMjAg KzMsNiBAQCBmdW5jdGlvbiBzaG91bGRCZShhY3R1YWwsIGV4cGVjdGVkKSB7CiAgICAgICAgIHRo cm93IG5ldyBFcnJvcihgYmFkIHZhbHVlOiAke1N0cmluZyhhY3R1YWwpfWApOwogfQogCi1mdW5j dGlvbiBzaG91bGRUaHJvdyhmdW5jLCBlcnJvck1lc3NhZ2UpIHsKLSAgICB2YXIgZXJyb3JUaHJv d24gPSBmYWxzZTsKLSAgICB2YXIgZXJyb3IgPSBudWxsOwotICAgIHRyeSB7Ci0gICAgICAgIGZ1 bmMoKTsKLSAgICB9IGNhdGNoIChlKSB7Ci0gICAgICAgIGVycm9yVGhyb3duID0gdHJ1ZTsKLSAg ICAgICAgZXJyb3IgPSBlOwotICAgIH0KLSAgICBpZiAoIWVycm9yVGhyb3duKQotICAgICAgICB0 aHJvdyBuZXcgRXJyb3IoJ25vdCB0aHJvd24nKTsKLSAgICBzaG91bGRCZShTdHJpbmcoZXJyb3Ip LCBlcnJvck1lc3NhZ2UpOwotfQotCiAvLyBDbGFzcy4KIChmdW5jdGlvbiAoKSB7CiAgICAgewpk aWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3MvZXZhbC1pbi1hcnJvdy1mdW5jdGlvbi5qcyBiL0pT VGVzdHMvc3RyZXNzL2V2YWwtaW4tYXJyb3ctZnVuY3Rpb24uanMKaW5kZXggMDk1OTExNTE0ODYu LjQwNDcyODY3MzdkIDEwMDY0NAotLS0gYS9KU1Rlc3RzL3N0cmVzcy9ldmFsLWluLWFycm93LWZ1 bmN0aW9uLmpzCisrKyBiL0pTVGVzdHMvc3RyZXNzL2V2YWwtaW4tYXJyb3ctZnVuY3Rpb24uanMK QEAgLTMsMjEgKzMsNiBAQCBmdW5jdGlvbiBzaG91bGRCZShhY3R1YWwsIGV4cGVjdGVkKSB7CiAg ICAgICAgIHRocm93IG5ldyBFcnJvcihgYmFkIHZhbHVlOiAke1N0cmluZyhhY3R1YWwpfWApOwog fQogCi1mdW5jdGlvbiBzaG91bGRUaHJvdyhmdW5jLCBlcnJvck1lc3NhZ2UpIHsKLSAgICB2YXIg ZXJyb3JUaHJvd24gPSBmYWxzZTsKLSAgICB2YXIgZXJyb3IgPSBudWxsOwotICAgIHRyeSB7Ci0g ICAgICAgIGZ1bmMoKTsKLSAgICB9IGNhdGNoIChlKSB7Ci0gICAgICAgIGVycm9yVGhyb3duID0g dHJ1ZTsKLSAgICAgICAgZXJyb3IgPSBlOwotICAgIH0KLSAgICBpZiAoIWVycm9yVGhyb3duKQot ICAgICAgICB0aHJvdyBuZXcgRXJyb3IoJ25vdCB0aHJvd24nKTsKLSAgICBpZiAoU3RyaW5nKGVy cm9yKSAhPT0gZXJyb3JNZXNzYWdlKQotICAgICAgICB0aHJvdyBuZXcgRXJyb3IoYGJhZCBlcnJv cjogJHtTdHJpbmcoZXJyb3IpfWApOwotfQotCiB2YXIgZ2xvYmFsID0gdGhpczsKIGZvciAodmFy IGkgPSAwOyBpIDwgMTAwOyArK2kpIHsKICAgICAoKCkgPT4gewpkaWZmIC0tZ2l0IGEvSlNUZXN0 cy9zdHJlc3MvcmVzdC1lbGVtZW50cy5qcyBiL0pTVGVzdHMvc3RyZXNzL3Jlc3QtZWxlbWVudHMu anMKaW5kZXggNjM3YWZlY2RiMTkuLmQ4Y2MxOGJlYzYwIDEwMDY0NAotLS0gYS9KU1Rlc3RzL3N0 cmVzcy9yZXN0LWVsZW1lbnRzLmpzCisrKyBiL0pTVGVzdHMvc3RyZXNzL3Jlc3QtZWxlbWVudHMu anMKQEAgLTMsMjEgKzMsNiBAQCBmdW5jdGlvbiBzaG91bGRCZShhY3R1YWwsIGV4cGVjdGVkKSB7 CiAgICAgICAgIHRocm93IG5ldyBFcnJvcignYmFkIHZhbHVlOiAnICsgYWN0dWFsKTsKIH0KIAot ZnVuY3Rpb24gc2hvdWxkVGhyb3coZnVuYywgZXJyb3JNZXNzYWdlKSB7Ci0gICAgdmFyIGVycm9y VGhyb3duID0gZmFsc2U7Ci0gICAgdmFyIGVycm9yID0gbnVsbDsKLSAgICB0cnkgewotICAgICAg ICBmdW5jKCk7Ci0gICAgfSBjYXRjaCAoZSkgewotICAgICAgICBlcnJvclRocm93biA9IHRydWU7 Ci0gICAgICAgIGVycm9yID0gZTsKLSAgICB9Ci0gICAgaWYgKCFlcnJvclRocm93bikKLSAgICAg ICAgdGhyb3cgbmV3IEVycm9yKCdub3QgdGhyb3duJyk7Ci0gICAgaWYgKFN0cmluZyhlcnJvcikg IT09IGVycm9yTWVzc2FnZSkKLSAgICAgICAgdGhyb3cgbmV3IEVycm9yKGBiYWQgZXJyb3I6ICR7 U3RyaW5nKGVycm9yKX1gKTsKLX0KLQogZnVuY3Rpb24gdGVzdFN5bnRheEVycm9yKHNjcmlwdCwg bWVzc2FnZSkgewogICAgIHZhciBlcnJvciA9IG51bGw7CiAgICAgdHJ5IHsKZGlmZiAtLWdpdCBh L0pTVGVzdHMvc3RyZXNzL3N0cmluZy1vYmplY3QtZGVmaW5lLW93bi1wcm9wZXJ0eS5qcyBiL0pT VGVzdHMvc3RyZXNzL3N0cmluZy1vYmplY3QtZGVmaW5lLW93bi1wcm9wZXJ0eS5qcwppbmRleCAy ZWQ3MTEzMWViNy4uNTIyNTIyZThjOTggMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvc3RyZXNzL3N0cmlu Zy1vYmplY3QtZGVmaW5lLW93bi1wcm9wZXJ0eS5qcworKysgYi9KU1Rlc3RzL3N0cmVzcy9zdHJp bmctb2JqZWN0LWRlZmluZS1vd24tcHJvcGVydHkuanMKQEAgLTMsMTkgKzMsNiBAQCBmdW5jdGlv biBzaG91bGRCZShhY3R1YWwsIGV4cGVjdGVkKSB7CiAgICAgICAgIHRocm93IG5ldyBFcnJvcign YmFkIHZhbHVlOiAnICsgYWN0dWFsKTsKIH0KIAotZnVuY3Rpb24gc2hvdWxkVGhyb3coZnVuYywg bWVzc2FnZSkgewotICAgIHZhciBlcnJvciA9IG51bGw7Ci0gICAgdHJ5IHsKLSAgICAgICAgZnVu YygpOwotICAgIH0gY2F0Y2ggKGUpIHsKLSAgICAgICAgZXJyb3IgPSBlOwotICAgIH0KLSAgICBp ZiAoIWVycm9yKQotICAgICAgICB0aHJvdyBuZXcgRXJyb3IoIm5vdCB0aHJvd24uIik7Ci0gICAg aWYgKFN0cmluZyhlcnJvcikgIT09IG1lc3NhZ2UpCi0gICAgICAgIHRocm93IG5ldyBFcnJvcigi YmFkIGVycm9yOiAiICsgU3RyaW5nKGVycm9yKSk7Ci19Ci0KIHZhciBzdHJpbmcgPSBuZXcgU3Ry aW5nKCJDb2NvYSIpOwogc2hvdWxkQmUoUmVmbGVjdC5kZWZpbmVQcm9wZXJ0eShzdHJpbmcsIDAs IHsKIH0pLCB0cnVlKTsKZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNzL3N5bWJvbC10b3ByaW1p dGl2ZS1lcnJvcnMuanMgYi9KU1Rlc3RzL3N0cmVzcy9zeW1ib2wtdG9wcmltaXRpdmUtZXJyb3Jz LmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi41NmFmZWEyZDRhYgot LS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL3N5bWJvbC10b3ByaW1pdGl2ZS1lcnJv cnMuanMKQEAgLTAsMCArMSw0NiBAQAorZnVuY3Rpb24gc2hvdWxkQmUoZnVuYywgZXhwZWN0ZWQp IHsKKyAgICBsZXQgcmVzdWx0ID0gZnVuYygpOworICAgIGlmIChyZXN1bHQgIT09IGV4cGVjdGVk KQorICAgICAgICB0aHJvdyBuZXcgRXJyb3IoImJhZCB2YWx1ZSIpOworfQorCitmdW5jdGlvbiBz aG91bGRUaHJvdyhmdW5jLCBlcnJvclR5cGUsIG1lc3NhZ2UpIHsKKyAgICBsZXQgZXJyb3JUaHJv d24gPSBmYWxzZTsKKyAgICBsZXQgZXJyb3IgPSBudWxsOworICAgIHRyeSB7CisgICAgICAgIGZ1 bmMoKTsKKyAgICB9IGNhdGNoIChlKSB7CisgICAgICAgIGVycm9yVGhyb3duID0gdHJ1ZTsKKyAg ICAgICAgZXJyb3IgPSBlOworICAgIH0KKyAgICBpZiAoIWVycm9yVGhyb3duKQorICAgICAgICB0 aHJvdyBuZXcgRXJyb3IoIm5vdCB0aHJvd24iKTsKKyAgICBpZiAoIShlcnJvciBpbnN0YW5jZW9m IGVycm9yVHlwZSkpCisgICAgICAgIHRocm93IG5ldyBFcnJvcigid3JvbmcgZXJyb3IgdHlwZSB0 aHJvd246ICIgKyBlcnJvcik7CisgICAgaWYgKGVycm9yLm1lc3NhZ2UgIT09IG1lc3NhZ2UpCisg ICAgICAgIHRocm93IG5ldyBFcnJvcigid3JvbmcgbWVzc2FnZSB0aHJvd246ICIgKyBlcnJvci5t ZXNzYWdlKTsKK30KKworc2hvdWxkQmUoKCkgPT4gaXNOYU4oe30pLCB0cnVlKTsKK3Nob3VsZEJl KCgpID0+IGlzTmFOKHtbU3ltYm9sLnRvUHJpbWl0aXZlXTogdW5kZWZpbmVkfSksIHRydWUpOwor c2hvdWxkQmUoKCkgPT4gaXNOYU4oe1tTeW1ib2wudG9QcmltaXRpdmVdOiBudWxsfSksIHRydWUp Oworc2hvdWxkQmUoKCkgPT4gaXNOYU4oe1tTeW1ib2wudG9QcmltaXRpdmVdKCkgeyAvKiBlbXB0 eSAqLyB9IH0pLCB0cnVlKTsKK3Nob3VsZEJlKCgpID0+IGlzTmFOKHtbU3ltYm9sLnRvUHJpbWl0 aXZlXSgpIHsgcmV0dXJuIE5hTiB9IH0pLCB0cnVlKTsKK3Nob3VsZEJlKCgpID0+IGlzTmFOKHtb U3ltYm9sLnRvUHJpbWl0aXZlXSgpIHsgcmV0dXJuIDEgfSB9KSwgZmFsc2UpOworCitzaG91bGRU aHJvdygoKSA9PiB7IGlzTmFOKHtbU3ltYm9sLnRvUHJpbWl0aXZlXTogMSB9KSB9LCBUeXBlRXJy b3IsICJTeW1ib2wudG9QcmltaXRpdmUgaXMgbm90IGEgZnVuY3Rpb24sIHVuZGVmaW5lZCwgb3Ig bnVsbCIpOworc2hvdWxkVGhyb3coKCkgPT4geyBpc05hTih7W1N5bWJvbC50b1ByaW1pdGl2ZV06 IE5hTiB9KSB9LCBUeXBlRXJyb3IsICJTeW1ib2wudG9QcmltaXRpdmUgaXMgbm90IGEgZnVuY3Rp b24sIHVuZGVmaW5lZCwgb3IgbnVsbCIpOworc2hvdWxkVGhyb3coKCkgPT4geyBpc05hTih7W1N5 bWJvbC50b1ByaW1pdGl2ZV06IHRydWUgfSkgfSwgVHlwZUVycm9yLCAiU3ltYm9sLnRvUHJpbWl0 aXZlIGlzIG5vdCBhIGZ1bmN0aW9uLCB1bmRlZmluZWQsIG9yIG51bGwiKTsKK3Nob3VsZFRocm93 KCgpID0+IHsgaXNOYU4oe1tTeW1ib2wudG9QcmltaXRpdmVdOiAic3RyaW5nIiB9KSB9LCBUeXBl RXJyb3IsICJTeW1ib2wudG9QcmltaXRpdmUgaXMgbm90IGEgZnVuY3Rpb24sIHVuZGVmaW5lZCwg b3IgbnVsbCIpOworc2hvdWxkVGhyb3coKCkgPT4geyBpc05hTih7W1N5bWJvbC50b1ByaW1pdGl2 ZV06IFN5bWJvbCgpIH0pIH0sIFR5cGVFcnJvciwgIlN5bWJvbC50b1ByaW1pdGl2ZSBpcyBub3Qg YSBmdW5jdGlvbiwgdW5kZWZpbmVkLCBvciBudWxsIik7CitzaG91bGRUaHJvdygoKSA9PiB7IGlz TmFOKHtbU3ltYm9sLnRvUHJpbWl0aXZlXToge30gfSkgfSwgVHlwZUVycm9yLCAiU3ltYm9sLnRv UHJpbWl0aXZlIGlzIG5vdCBhIGZ1bmN0aW9uLCB1bmRlZmluZWQsIG9yIG51bGwiKTsKK3Nob3Vs ZFRocm93KCgpID0+IHsgaXNOYU4oe1tTeW1ib2wudG9QcmltaXRpdmVdOiBbXSB9KSB9LCBUeXBl RXJyb3IsICJTeW1ib2wudG9QcmltaXRpdmUgaXMgbm90IGEgZnVuY3Rpb24sIHVuZGVmaW5lZCwg b3IgbnVsbCIpOworc2hvdWxkVGhyb3coKCkgPT4geyBpc05hTih7W1N5bWJvbC50b1ByaW1pdGl2 ZV06IC9yZWdleC8gfSkgfSwgVHlwZUVycm9yLCAiU3ltYm9sLnRvUHJpbWl0aXZlIGlzIG5vdCBh IGZ1bmN0aW9uLCB1bmRlZmluZWQsIG9yIG51bGwiKTsKKworc2hvdWxkVGhyb3coKCkgPT4geyBp c05hTih7W1N5bWJvbC50b1ByaW1pdGl2ZV0oKSB7IHJldHVybiB0aGlzIH0gfSkgfSwgVHlwZUVy cm9yLCAiU3ltYm9sLnRvUHJpbWl0aXZlIHJldHVybmVkIGFuIG9iamVjdCIpOworc2hvdWxkVGhy b3coKCkgPT4geyBpc05hTih7W1N5bWJvbC50b1ByaW1pdGl2ZV0oKSB7IHJldHVybiB7fSB9IH0p IH0sIFR5cGVFcnJvciwgIlN5bWJvbC50b1ByaW1pdGl2ZSByZXR1cm5lZCBhbiBvYmplY3QiKTsK K3Nob3VsZFRocm93KCgpID0+IHsgaXNOYU4oe1tTeW1ib2wudG9QcmltaXRpdmVdKCkgeyByZXR1 cm4gW10gfSB9KSB9LCBUeXBlRXJyb3IsICJTeW1ib2wudG9QcmltaXRpdmUgcmV0dXJuZWQgYW4g b2JqZWN0Iik7CitzaG91bGRUaHJvdygoKSA9PiB7IGlzTmFOKHtbU3ltYm9sLnRvUHJpbWl0aXZl XSgpIHsgcmV0dXJuIC9yZWdleC8gfSB9KSB9LCBUeXBlRXJyb3IsICJTeW1ib2wudG9QcmltaXRp dmUgcmV0dXJuZWQgYW4gb2JqZWN0Iik7CitzaG91bGRUaHJvdygoKSA9PiB7IGlzTmFOKHtbU3lt Ym9sLnRvUHJpbWl0aXZlXSgpIHsgcmV0dXJuIGZ1bmN0aW9uKCl7fSB9IH0pIH0sIFR5cGVFcnJv ciwgIlN5bWJvbC50b1ByaW1pdGl2ZSByZXR1cm5lZCBhbiBvYmplY3QiKTsKK3Nob3VsZFRocm93 KCgpID0+IHsgaXNOYU4oe1tTeW1ib2wudG9QcmltaXRpdmVdKCkgeyByZXR1cm4gU3ltYm9sKCkg fSB9KSB9LCBUeXBlRXJyb3IsICJDYW5ub3QgY29udmVydCBhIHN5bWJvbCB0byBhIG51bWJlciIp Oworc2hvdWxkVGhyb3coKCkgPT4geyBpc05hTih7W1N5bWJvbC50b1ByaW1pdGl2ZV0oKSB7IHRo cm93IG5ldyBFcnJvcigiSW5uZXIgRXJyb3IiKSB9IH0pIH0sIEVycm9yLCAiSW5uZXIgRXJyb3Ii KTsKZGlmZiAtLWdpdCBhL0pTVGVzdHMvdGVzdDI2Mi55YW1sIGIvSlNUZXN0cy90ZXN0MjYyLnlh bWwKaW5kZXggMjc2MzQ0ZDEwNDguLjNjMjM4N2Q5YTE0IDEwMDY0NAotLS0gYS9KU1Rlc3RzL3Rl c3QyNjIueWFtbAorKysgYi9KU1Rlc3RzL3Rlc3QyNjIueWFtbApAQCAtNTA3MDIsOSArNTA3MDIs OSBAQAogLSBwYXRoOiB0ZXN0MjYyL3Rlc3QvYnVpbHQtaW5zL2lzRmluaXRlL3RvcHJpbWl0aXZl LWdldC1hYnJ1cHQuanMKICAgY21kOiBydW5UZXN0MjYyIDpub3JtYWwsICJOb0V4Y2VwdGlvbiIs IFsiLi4vLi4vLi4vaGFybmVzcy9hc3NlcnQuanMiLCAiLi4vLi4vLi4vaGFybmVzcy9zdGEuanMi XSwgWzpzdHJpY3RdCiAtIHBhdGg6IHRlc3QyNjIvdGVzdC9idWlsdC1pbnMvaXNGaW5pdGUvdG9w cmltaXRpdmUtbm90LWNhbGxhYmxlLXRocm93cy5qcwotICBjbWQ6IHJ1blRlc3QyNjIgOmZhaWws ICJOb0V4Y2VwdGlvbiIsIFsiLi4vLi4vLi4vaGFybmVzcy9hc3NlcnQuanMiLCAiLi4vLi4vLi4v aGFybmVzcy9zdGEuanMiXSwgW10KKyAgY21kOiBydW5UZXN0MjYyIDpub3JtYWwsICJOb0V4Y2Vw dGlvbiIsIFsiLi4vLi4vLi4vaGFybmVzcy9hc3NlcnQuanMiLCAiLi4vLi4vLi4vaGFybmVzcy9z dGEuanMiXSwgW10KIC0gcGF0aDogdGVzdDI2Mi90ZXN0L2J1aWx0LWlucy9pc0Zpbml0ZS90b3By aW1pdGl2ZS1ub3QtY2FsbGFibGUtdGhyb3dzLmpzCi0gIGNtZDogcnVuVGVzdDI2MiA6ZmFpbCwg Ik5vRXhjZXB0aW9uIiwgWyIuLi8uLi8uLi9oYXJuZXNzL2Fzc2VydC5qcyIsICIuLi8uLi8uLi9o YXJuZXNzL3N0YS5qcyJdLCBbOnN0cmljdF0KKyAgY21kOiBydW5UZXN0MjYyIDpub3JtYWwsICJO b0V4Y2VwdGlvbiIsIFsiLi4vLi4vLi4vaGFybmVzcy9hc3NlcnQuanMiLCAiLi4vLi4vLi4vaGFy bmVzcy9zdGEuanMiXSwgWzpzdHJpY3RdCiAtIHBhdGg6IHRlc3QyNjIvdGVzdC9idWlsdC1pbnMv aXNGaW5pdGUvdG9wcmltaXRpdmUtcmVzdWx0LWlzLW9iamVjdC10aHJvd3MuanMKICAgY21kOiBy dW5UZXN0MjYyIDpub3JtYWwsICJOb0V4Y2VwdGlvbiIsIFsiLi4vLi4vLi4vaGFybmVzcy9hc3Nl cnQuanMiLCAiLi4vLi4vLi4vaGFybmVzcy9zdGEuanMiXSwgW10KIC0gcGF0aDogdGVzdDI2Mi90 ZXN0L2J1aWx0LWlucy9pc0Zpbml0ZS90b3ByaW1pdGl2ZS1yZXN1bHQtaXMtb2JqZWN0LXRocm93 cy5qcwpAQCAtNTA3NjYsOSArNTA3NjYsOSBAQAogLSBwYXRoOiB0ZXN0MjYyL3Rlc3QvYnVpbHQt aW5zL2lzTmFOL3RvcHJpbWl0aXZlLWdldC1hYnJ1cHQuanMKICAgY21kOiBydW5UZXN0MjYyIDpu b3JtYWwsICJOb0V4Y2VwdGlvbiIsIFsiLi4vLi4vLi4vaGFybmVzcy9hc3NlcnQuanMiLCAiLi4v Li4vLi4vaGFybmVzcy9zdGEuanMiXSwgWzpzdHJpY3RdCiAtIHBhdGg6IHRlc3QyNjIvdGVzdC9i dWlsdC1pbnMvaXNOYU4vdG9wcmltaXRpdmUtbm90LWNhbGxhYmxlLXRocm93cy5qcwotICBjbWQ6 IHJ1blRlc3QyNjIgOmZhaWwsICJOb0V4Y2VwdGlvbiIsIFsiLi4vLi4vLi4vaGFybmVzcy9hc3Nl cnQuanMiLCAiLi4vLi4vLi4vaGFybmVzcy9zdGEuanMiXSwgW10KKyAgY21kOiBydW5UZXN0MjYy IDpub3JtYWwsICJOb0V4Y2VwdGlvbiIsIFsiLi4vLi4vLi4vaGFybmVzcy9hc3NlcnQuanMiLCAi Li4vLi4vLi4vaGFybmVzcy9zdGEuanMiXSwgW10KIC0gcGF0aDogdGVzdDI2Mi90ZXN0L2J1aWx0 LWlucy9pc05hTi90b3ByaW1pdGl2ZS1ub3QtY2FsbGFibGUtdGhyb3dzLmpzCi0gIGNtZDogcnVu VGVzdDI2MiA6ZmFpbCwgIk5vRXhjZXB0aW9uIiwgWyIuLi8uLi8uLi9oYXJuZXNzL2Fzc2VydC5q cyIsICIuLi8uLi8uLi9oYXJuZXNzL3N0YS5qcyJdLCBbOnN0cmljdF0KKyAgY21kOiBydW5UZXN0 MjYyIDpub3JtYWwsICJOb0V4Y2VwdGlvbiIsIFsiLi4vLi4vLi4vaGFybmVzcy9hc3NlcnQuanMi LCAiLi4vLi4vLi4vaGFybmVzcy9zdGEuanMiXSwgWzpzdHJpY3RdCiAtIHBhdGg6IHRlc3QyNjIv dGVzdC9idWlsdC1pbnMvaXNOYU4vdG9wcmltaXRpdmUtcmVzdWx0LWlzLW9iamVjdC10aHJvd3Mu anMKICAgY21kOiBydW5UZXN0MjYyIDpub3JtYWwsICJOb0V4Y2VwdGlvbiIsIFsiLi4vLi4vLi4v aGFybmVzcy9hc3NlcnQuanMiLCAiLi4vLi4vLi4vaGFybmVzcy9zdGEuanMiXSwgW10KIC0gcGF0 aDogdGVzdDI2Mi90ZXN0L2J1aWx0LWlucy9pc05hTi90b3ByaW1pdGl2ZS1yZXN1bHQtaXMtb2Jq ZWN0LXRocm93cy5qcwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggZWE5MDYwNjE5NGEuLjA3 ZTJhNTJhYjM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNSBAQAogMjAx Ny0wNC0xNiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCisgICAgICAg IHRlc3QyNjI6IHRlc3QyNjIvdGVzdC9idWlsdC1pbnMvaXNOYU4vdG9wcmltaXRpdmUtbm90LWNh bGxhYmxlLXRocm93cy5qcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTcwODg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBydW50aW1lL0V4Y2VwdGlvbkhlbHBlcnMuaDoKKyAgICAgICAgKiBydW50aW1l L0V4Y2VwdGlvbkhlbHBlcnMuY3BwOgorICAgICAgICAoSlNDOjpjcmVhdGVJbnZhbGlkSW5zdGFu Y2VvZlBhcmFtZXRlckVycm9ySGFzSW5zdGFuY2VWYWx1ZU5vdEZ1bmN0aW9uKToKKyAgICAgICAg Rml4IHVwIHRoaXMgZnVuY3Rpb24gbmFtZS4KKworICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3Qu Y3BwOgorICAgICAgICAoSlNDOjpjYWxsVG9QcmltaXRpdmVGdW5jdGlvbik6CisgICAgICAgIFdo ZW4gY2FsbGVkIHdpdGggQEBpc1ByaW1pdGl2ZSwgYmFpbCBvbiB1bmRlZmluZWQgb3IgbnVsbCBh bmQKKyAgICAgICAgdGhyb3cgYSB0eXBlIGVycm9yIGlmIHRoZSB2YWx1ZSBpcyBub3QgY2FsbGFi bGUuCisKKyAgICAgICAgKEpTQzo6SlNPYmplY3Q6OnRvUHJpbWl0aXZlKToKKyAgICAgICAgVXNl IHRocm93IHNjb3BlIHRvIGNoZWNrIGZvciBleGNlcHRpb24uCisKKzIwMTctMDQtMTYgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICB0ZXN0MjYyOiB0ZXN0 MjYyL3Rlc3QvYnVpbHQtaW5zL0RhdGUvcHJvdG90eXBlL1N5bWJvbC50b1ByaW1pdGl2ZS9uYW1l LmpzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzA4 ODQKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9u SGVscGVycy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNlcHRpb25IZWxw ZXJzLmNwcAppbmRleCBmMThmYzVkYzJiOS4uY2RjN2MwOGJlMzcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlvbkhlbHBlcnMuY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlvbkhlbHBlcnMuY3BwCkBAIC0yNjksNyAr MjY5LDcgQEAgSlNPYmplY3QqIGNyZWF0ZUludmFsaWRJbnN0YW5jZW9mUGFyYW1ldGVyRXJyb3JO b3RGdW5jdGlvbihFeGVjU3RhdGUqIGV4ZWMsIEpTVmEKICAgICByZXR1cm4gY3JlYXRlRXJyb3Io ZXhlYywgdmFsdWUsIG1ha2VTdHJpbmcoIiBpcyBub3QgYSBmdW5jdGlvbiIpLCBpbnZhbGlkUGFy YW1ldGVySW5zdGFuY2VvZk5vdEZ1bmN0aW9uU291cmNlQXBwZW5kZXIpOwogfQogCi1KU09iamVj dCogY3JlYXRlSW52YWxpZEluc3RhbmNlb2ZQYXJhbWV0ZXJFcnJvcmhhc0luc3RhbmNlVmFsdWVO b3RGdW5jdGlvbihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUpCitKU09iamVjdCogY3Jl YXRlSW52YWxpZEluc3RhbmNlb2ZQYXJhbWV0ZXJFcnJvckhhc0luc3RhbmNlVmFsdWVOb3RGdW5j dGlvbihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUpCiB7CiAgICAgcmV0dXJuIGNyZWF0 ZUVycm9yKGV4ZWMsIHZhbHVlLCBtYWtlU3RyaW5nKCJbU3ltYm9sLmhhc0luc3RhbmNlXSBpcyBu b3QgYSBmdW5jdGlvbiwgdW5kZWZpbmVkLCBvciBudWxsIiksIGludmFsaWRQYXJhbWV0ZXJJbnN0 YW5jZW9maGFzSW5zdGFuY2VWYWx1ZU5vdEZ1bmN0aW9uU291cmNlQXBwZW5kZXIpOwogfQpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9uSGVscGVycy5o IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9uSGVscGVycy5oCmluZGV4 IDBjZmNhOWNiZDE1Li4wOGU5ZDE4NGFmNyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvRXhjZXB0aW9uSGVscGVycy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0V4Y2VwdGlvbkhlbHBlcnMuaApAQCAtNDksNyArNDksNyBAQCBKU09iamVjdCog Y3JlYXRlTm90QW5PYmplY3RFcnJvcihFeGVjU3RhdGUqLCBKU1ZhbHVlKTsKIEpTT2JqZWN0KiBj cmVhdGVJbnZhbGlkRnVuY3Rpb25BcHBseVBhcmFtZXRlckVycm9yKEV4ZWNTdGF0ZSosIEpTVmFs dWUpOwogSlNPYmplY3QqIGNyZWF0ZUludmFsaWRJblBhcmFtZXRlckVycm9yKEV4ZWNTdGF0ZSos IEpTVmFsdWUpOwogSlNPYmplY3QqIGNyZWF0ZUludmFsaWRJbnN0YW5jZW9mUGFyYW1ldGVyRXJy b3JOb3RGdW5jdGlvbihFeGVjU3RhdGUqLCBKU1ZhbHVlKTsKLUpTT2JqZWN0KiBjcmVhdGVJbnZh bGlkSW5zdGFuY2VvZlBhcmFtZXRlckVycm9yaGFzSW5zdGFuY2VWYWx1ZU5vdEZ1bmN0aW9uKEV4 ZWNTdGF0ZSosIEpTVmFsdWUpOworSlNPYmplY3QqIGNyZWF0ZUludmFsaWRJbnN0YW5jZW9mUGFy YW1ldGVyRXJyb3JIYXNJbnN0YW5jZVZhbHVlTm90RnVuY3Rpb24oRXhlY1N0YXRlKiwgSlNWYWx1 ZSk7CiBKU09iamVjdCogY3JlYXRlTm90QUNvbnN0cnVjdG9yRXJyb3IoRXhlY1N0YXRlKiwgSlNW YWx1ZSk7CiBKU09iamVjdCogY3JlYXRlTm90QUZ1bmN0aW9uRXJyb3IoRXhlY1N0YXRlKiwgSlNW YWx1ZSk7CiBKU09iamVjdCogY3JlYXRlRXJyb3JGb3JJbnZhbGlkR2xvYmFsQXNzaWdubWVudChF eGVjU3RhdGUqLCBjb25zdCBTdHJpbmcmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0pTT2JqZWN0LmNwcAppbmRleCA4ODdkZjkyMWQ1MC4uMzczMGUyY2U1N2YgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAKQEAgLTE4OTcsMTIgKzE4OTcsMTUg QEAgc3RhdGljIEFMV0FZU19JTkxJTkUgSlNWYWx1ZSBjYWxsVG9QcmltaXRpdmVGdW5jdGlvbihF eGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEpTT2IKIAogICAgIEpTVmFsdWUgZnVuY3Rpb24gPSBvYmpl Y3QtPmdldChleGVjLCBwcm9wZXJ0eU5hbWUpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2Nv cGUsIHNjb3BlLmV4Y2VwdGlvbigpKTsKLSAgICBpZiAoZnVuY3Rpb24uaXNVbmRlZmluZWQoKSAm JiBtb2RlID09IFR5cGVIaW50TW9kZTo6VGFrZXNIaW50KQorICAgIGlmIChmdW5jdGlvbi5pc1Vu ZGVmaW5lZE9yTnVsbCgpICYmIG1vZGUgPT0gVHlwZUhpbnRNb2RlOjpUYWtlc0hpbnQpCiAgICAg ICAgIHJldHVybiBKU1ZhbHVlKCk7CiAgICAgQ2FsbERhdGEgY2FsbERhdGE7CiAgICAgQ2FsbFR5 cGUgY2FsbFR5cGUgPSBnZXRDYWxsRGF0YShmdW5jdGlvbiwgY2FsbERhdGEpOwotICAgIGlmIChj YWxsVHlwZSA9PSBDYWxsVHlwZTo6Tm9uZSkKKyAgICBpZiAoY2FsbFR5cGUgPT0gQ2FsbFR5cGU6 Ok5vbmUpIHsKKyAgICAgICAgaWYgKG1vZGUgPT0gVHlwZUhpbnRNb2RlOjpUYWtlc0hpbnQpCisg ICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihleGVjLCBzY29wZSwgQVNDSUlMaXRlcmFsKCJTeW1i b2wudG9QcmltaXRpdmUgaXMgbm90IGEgZnVuY3Rpb24sIHVuZGVmaW5lZCwgb3IgbnVsbCIpKTsK ICAgICAgICAgcmV0dXJuIHNjb3BlLmV4Y2VwdGlvbigpOworICAgIH0KIAogICAgIE1hcmtlZEFy Z3VtZW50QnVmZmVyIGNhbGxBcmdzOwogICAgIGlmIChtb2RlID09IFR5cGVIaW50TW9kZTo6VGFr ZXNIaW50KSB7CkBAIC0xOTcyLDcgKzE5NzUsMTEgQEAgSlNWYWx1ZSBKU09iamVjdDo6ZGVmYXVs dFZhbHVlKGNvbnN0IEpTT2JqZWN0KiBvYmplY3QsIEV4ZWNTdGF0ZSogZXhlYywgUHJlZmVycmUK IAogSlNWYWx1ZSBKU09iamVjdDo6dG9QcmltaXRpdmUoRXhlY1N0YXRlKiBleGVjLCBQcmVmZXJy ZWRQcmltaXRpdmVUeXBlIHByZWZlcnJlZFR5cGUpIGNvbnN0CiB7CisgICAgVk0mIHZtID0gZXhl Yy0+dm0oKTsKKyAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CisKICAg ICBKU1ZhbHVlIHZhbHVlID0gY2FsbFRvUHJpbWl0aXZlRnVuY3Rpb248VHlwZUhpbnRNb2RlOjpU YWtlc0hpbnQ+KGV4ZWMsIHRoaXMsIGV4ZWMtPnByb3BlcnR5TmFtZXMoKS50b1ByaW1pdGl2ZVN5 bWJvbCwgcHJlZmVycmVkVHlwZSk7CisgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9 KTsKICAgICBpZiAodmFsdWUpCiAgICAgICAgIHJldHVybiB2YWx1ZTsKIApAQCAtMjAxNywxMyAr MjAyNCwxMiBAQCBib29sIEpTT2JqZWN0OjpoYXNJbnN0YW5jZShFeGVjU3RhdGUqIGV4ZWMsIEpT VmFsdWUgdmFsdWUsIEpTVmFsdWUgaGFzSW5zdGFuY2VWYQogewogICAgIFZNJiB2bSA9IGV4ZWMt PnZtKCk7CiAgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwotICAgIAog CiAgICAgaWYgKCFoYXNJbnN0YW5jZVZhbHVlLmlzVW5kZWZpbmVkT3JOdWxsKCkgJiYgaGFzSW5z dGFuY2VWYWx1ZSAhPSBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCktPmZ1bmN0aW9uUHJvdG9I YXNJbnN0YW5jZVN5bWJvbEZ1bmN0aW9uKCkpIHsKICAgICAgICAgQ2FsbERhdGEgY2FsbERhdGE7 CiAgICAgICAgIENhbGxUeXBlIGNhbGxUeXBlID0gSlNDOjpnZXRDYWxsRGF0YShoYXNJbnN0YW5j ZVZhbHVlLCBjYWxsRGF0YSk7CiAgICAgICAgIGlmIChjYWxsVHlwZSA9PSBDYWxsVHlwZTo6Tm9u ZSkgewotICAgICAgICAgICAgdGhyb3dFeGNlcHRpb24oZXhlYywgc2NvcGUsIGNyZWF0ZUludmFs aWRJbnN0YW5jZW9mUGFyYW1ldGVyRXJyb3JoYXNJbnN0YW5jZVZhbHVlTm90RnVuY3Rpb24oZXhl YywgdGhpcykpOworICAgICAgICAgICAgdGhyb3dFeGNlcHRpb24oZXhlYywgc2NvcGUsIGNyZWF0 ZUludmFsaWRJbnN0YW5jZW9mUGFyYW1ldGVyRXJyb3JIYXNJbnN0YW5jZVZhbHVlTm90RnVuY3Rp b24oZXhlYywgdGhpcykpOwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAK