99196 2012-10-12 12:00:11 -0700 DFG array allocation calls should not return an encoded JSValue 2012-10-12 12:22:48 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 98608 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver oldest_to_newest 741092 0 fpizlo 2012-10-12 12:00:11 -0700 They should return a pointer instead. 741095 1 168459 fpizlo 2012-10-12 12:04:27 -0700 Created attachment 168459 the patch 741100 2 168459 mhahnenberg 2012-10-12 12:07:35 -0700 Comment on attachment 168459 the patch r=me 741111 3 fpizlo 2012-10-12 12:22:48 -0700 Landed in http://trac.webkit.org/changeset/131210 168459 2012-10-12 12:04:27 -0700 2012-10-12 12:07:35 -0700 the patch returnpointer_1.patch text/plain 15632 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTMxMjA1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBA CisyMDEyLTEwLTEyICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHIGFycmF5IGFsbG9jYXRpb24gY2FsbHMgc2hvdWxkIG5vdCByZXR1cm4gYW4gZW5jb2RlZCBK U1ZhbHVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 OTE5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZSBhcnJheSBhbGxvY2F0aW9uIG9wZXJhdGlvbnMgbm93IHJldHVybiBhIHBvaW50ZXIgaW5zdGVh ZC4gVGhpcyBtYWtlcyBpdAorICAgICAgICBlYXNpZXIgdG8gc2hhcmUgY29kZSBiZXR3ZWVuIDMy LWJpdCBhbmQgNjQtYml0LgorCisgICAgICAgICogZGZnL0RGR09wZXJhdGlvbnMuY3BwOgorICAg ICAgICAqIGRmZy9ERkdPcGVyYXRpb25zLmg6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZl SklULmg6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNhbGxPcGVyYXRpb24p OgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcDoKKyAgICAgICAgKEpT Qzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZSk6CisKIDIwMTItMTAtMDEgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIEVOQ1JZUFRFRF9NRURJ QSBzdXBwb3J0IG9uIE1hYy4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3Bl cmF0aW9ucy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdP cGVyYXRpb25zLmNwcAkocmV2aXNpb24gMTMxMDg3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdPcGVyYXRpb25zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTEwNiwyOSArMTEwNiwy OSBAQCBFbmNvZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9OIG9wZXJhdGlvblN0CiAgICAgcmV0dXJu IEpTVmFsdWU6OmVuY29kZShqc1N0cmluZyhleGVjLCBzdGF0aWNfY2FzdDxSZWdpc3Rlcio+KGJ1 ZmZlciksIHNpemUpKTsKIH0KIAotRW5jb2RlZEpTVmFsdWUgREZHX09QRVJBVElPTiBvcGVyYXRp b25OZXdBcnJheShFeGVjU3RhdGUqIGV4ZWMsIFN0cnVjdHVyZSogYXJyYXlTdHJ1Y3R1cmUsIHZv aWQqIGJ1ZmZlciwgc2l6ZV90IHNpemUpCitjaGFyKiBERkdfT1BFUkFUSU9OIG9wZXJhdGlvbk5l d0FycmF5KEV4ZWNTdGF0ZSogZXhlYywgU3RydWN0dXJlKiBhcnJheVN0cnVjdHVyZSwgdm9pZCog YnVmZmVyLCBzaXplX3Qgc2l6ZSkKIHsKICAgICBKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEgPSAm ZXhlYy0+Z2xvYmFsRGF0YSgpOwogICAgIE5hdGl2ZUNhbGxGcmFtZVRyYWNlciB0cmFjZXIoZ2xv YmFsRGF0YSwgZXhlYyk7CiAKLSAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGNvbnN0cnVjdEFy cmF5KGV4ZWMsIGFycmF5U3RydWN0dXJlLCBzdGF0aWNfY2FzdDxKU1ZhbHVlKj4oYnVmZmVyKSwg c2l6ZSkpOworICAgIHJldHVybiBiaXR3aXNlX2Nhc3Q8Y2hhcio+KGNvbnN0cnVjdEFycmF5KGV4 ZWMsIGFycmF5U3RydWN0dXJlLCBzdGF0aWNfY2FzdDxKU1ZhbHVlKj4oYnVmZmVyKSwgc2l6ZSkp OwogfQogCi1FbmNvZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9OIG9wZXJhdGlvbk5ld0VtcHR5QXJy YXkoRXhlY1N0YXRlKiBleGVjLCBTdHJ1Y3R1cmUqIGFycmF5U3RydWN0dXJlKQorY2hhciogREZH X09QRVJBVElPTiBvcGVyYXRpb25OZXdFbXB0eUFycmF5KEV4ZWNTdGF0ZSogZXhlYywgU3RydWN0 dXJlKiBhcnJheVN0cnVjdHVyZSkKIHsKLSAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKEpTQXJy YXk6OmNyZWF0ZShleGVjLT5nbG9iYWxEYXRhKCksIGFycmF5U3RydWN0dXJlKSk7CisgICAgcmV0 dXJuIGJpdHdpc2VfY2FzdDxjaGFyKj4oSlNBcnJheTo6Y3JlYXRlKGV4ZWMtPmdsb2JhbERhdGEo KSwgYXJyYXlTdHJ1Y3R1cmUpKTsKIH0KIAotRW5jb2RlZEpTVmFsdWUgREZHX09QRVJBVElPTiBv cGVyYXRpb25OZXdBcnJheVdpdGhTaXplKEV4ZWNTdGF0ZSogZXhlYywgU3RydWN0dXJlKiBhcnJh eVN0cnVjdHVyZSwgaW50MzJfdCBzaXplKQorY2hhciogREZHX09QRVJBVElPTiBvcGVyYXRpb25O ZXdBcnJheVdpdGhTaXplKEV4ZWNTdGF0ZSogZXhlYywgU3RydWN0dXJlKiBhcnJheVN0cnVjdHVy ZSwgaW50MzJfdCBzaXplKQogewotICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoSlNBcnJheTo6 Y3JlYXRlKGV4ZWMtPmdsb2JhbERhdGEoKSwgYXJyYXlTdHJ1Y3R1cmUsIHNpemUpKTsKKyAgICBy ZXR1cm4gYml0d2lzZV9jYXN0PGNoYXIqPihKU0FycmF5OjpjcmVhdGUoZXhlYy0+Z2xvYmFsRGF0 YSgpLCBhcnJheVN0cnVjdHVyZSwgc2l6ZSkpOwogfQogCi1FbmNvZGVkSlNWYWx1ZSBERkdfT1BF UkFUSU9OIG9wZXJhdGlvbk5ld0FycmF5QnVmZmVyKEV4ZWNTdGF0ZSogZXhlYywgU3RydWN0dXJl KiBhcnJheVN0cnVjdHVyZSwgc2l6ZV90IHN0YXJ0LCBzaXplX3Qgc2l6ZSkKK2NoYXIqIERGR19P UEVSQVRJT04gb3BlcmF0aW9uTmV3QXJyYXlCdWZmZXIoRXhlY1N0YXRlKiBleGVjLCBTdHJ1Y3R1 cmUqIGFycmF5U3RydWN0dXJlLCBzaXplX3Qgc3RhcnQsIHNpemVfdCBzaXplKQogewogICAgIEpT R2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSA9IGV4ZWMtPmdsb2JhbERhdGEoKTsKICAgICBOYXRpdmVD YWxsRnJhbWVUcmFjZXIgdHJhY2VyKCZnbG9iYWxEYXRhLCBleGVjKTsKLSAgICByZXR1cm4gSlNW YWx1ZTo6ZW5jb2RlKGNvbnN0cnVjdEFycmF5KGV4ZWMsIGFycmF5U3RydWN0dXJlLCBleGVjLT5j b2RlQmxvY2soKS0+Y29uc3RhbnRCdWZmZXIoc3RhcnQpLCBzaXplKSk7CisgICAgcmV0dXJuIGJp dHdpc2VfY2FzdDxjaGFyKj4oY29uc3RydWN0QXJyYXkoZXhlYywgYXJyYXlTdHJ1Y3R1cmUsIGV4 ZWMtPmNvZGVCbG9jaygpLT5jb25zdGFudEJ1ZmZlcihzdGFydCksIHNpemUpKTsKIH0KIAogRW5j b2RlZEpTVmFsdWUgREZHX09QRVJBVElPTiBvcGVyYXRpb25OZXdSZWdleHAoRXhlY1N0YXRlKiBl eGVjLCB2b2lkKiByZWdleHBQdHIpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R09wZXJhdGlvbnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R09wZXJhdGlvbnMuaAkocmV2aXNpb24gMTMxMDg3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdPcGVyYXRpb25zLmgJKHdvcmtpbmcgY29weSkKQEAgLTc3LDEwICs3Nyw2IEBAIHR5 cGVkZWYgRW5jb2RlZEpTVmFsdWUgREZHX09QRVJBVElPTiAoKkoKIHR5cGVkZWYgRW5jb2RlZEpT VmFsdWUgREZHX09QRVJBVElPTiAoKkpfREZHT3BlcmF0aW9uX0VQUCkoRXhlY1N0YXRlKiwgdm9p ZCosIHZvaWQqKTsKIHR5cGVkZWYgRW5jb2RlZEpTVmFsdWUgREZHX09QRVJBVElPTiAoKkpfREZH T3BlcmF0aW9uX0VQUykoRXhlY1N0YXRlKiwgdm9pZCosIHNpemVfdCk7CiB0eXBlZGVmIEVuY29k ZWRKU1ZhbHVlIERGR19PUEVSQVRJT04gKCpKX0RGR09wZXJhdGlvbl9FU1MpKEV4ZWNTdGF0ZSos IHNpemVfdCwgc2l6ZV90KTsKLXR5cGVkZWYgRW5jb2RlZEpTVmFsdWUgREZHX09QRVJBVElPTiAo KkpfREZHT3BlcmF0aW9uX0VTdCkoRXhlY1N0YXRlKiwgU3RydWN0dXJlKik7Ci10eXBlZGVmIEVu Y29kZWRKU1ZhbHVlIERGR19PUEVSQVRJT04gKCpKX0RGR09wZXJhdGlvbl9FU3RaKShFeGVjU3Rh dGUqLCBTdHJ1Y3R1cmUqLCBpbnQzMl90KTsKLXR5cGVkZWYgRW5jb2RlZEpTVmFsdWUgREZHX09Q RVJBVElPTiAoKkpfREZHT3BlcmF0aW9uX0VTdFBTKShFeGVjU3RhdGUqLCBTdHJ1Y3R1cmUqLCB2 b2lkKiwgc2l6ZV90KTsKLXR5cGVkZWYgRW5jb2RlZEpTVmFsdWUgREZHX09QRVJBVElPTiAoKkpf REZHT3BlcmF0aW9uX0VTdFNTKShFeGVjU3RhdGUqLCBTdHJ1Y3R1cmUqLCBzaXplX3QsIHNpemVf dCk7CiB0eXBlZGVmIEVuY29kZWRKU1ZhbHVlIERGR19PUEVSQVRJT04gKCpKX0RGR09wZXJhdGlv bl9FWikoRXhlY1N0YXRlKiwgaW50MzJfdCk7CiB0eXBlZGVmIEVuY29kZWRKU1ZhbHVlIERGR19P UEVSQVRJT04gKCpKX0RGR09wZXJhdGlvbl9FWkljZlopKEV4ZWNTdGF0ZSosIGludDMyX3QsIElu bGluZUNhbGxGcmFtZSosIGludDMyX3QpOwogdHlwZWRlZiBFbmNvZGVkSlNWYWx1ZSBERkdfT1BF UkFUSU9OICgqSl9ERkdPcGVyYXRpb25fRVpaKShFeGVjU3RhdGUqLCBpbnQzMl90LCBpbnQzMl90 KTsKQEAgLTExNCw2ICsxMTAsMTAgQEAgdHlwZWRlZiBjaGFyKiBERkdfT1BFUkFUSU9OICgqUF9E RkdPcGVyYQogdHlwZWRlZiBjaGFyKiBERkdfT1BFUkFUSU9OICgqUF9ERkdPcGVyYXRpb25fRU9a KShFeGVjU3RhdGUqLCBKU09iamVjdCosIGludDMyX3QpOwogdHlwZWRlZiBjaGFyKiBERkdfT1BF UkFUSU9OICgqUF9ERkdPcGVyYXRpb25fRVBTKShFeGVjU3RhdGUqLCB2b2lkKiwgc2l6ZV90KTsK IHR5cGVkZWYgY2hhciogREZHX09QRVJBVElPTiAoKlBfREZHT3BlcmF0aW9uX0VTKShFeGVjU3Rh dGUqLCBzaXplX3QpOwordHlwZWRlZiBjaGFyKiBERkdfT1BFUkFUSU9OICgqUF9ERkdPcGVyYXRp b25fRVN0KShFeGVjU3RhdGUqLCBTdHJ1Y3R1cmUqKTsKK3R5cGVkZWYgY2hhciogREZHX09QRVJB VElPTiAoKlBfREZHT3BlcmF0aW9uX0VTdFBTKShFeGVjU3RhdGUqLCBTdHJ1Y3R1cmUqLCB2b2lk Kiwgc2l6ZV90KTsKK3R5cGVkZWYgY2hhciogREZHX09QRVJBVElPTiAoKlBfREZHT3BlcmF0aW9u X0VTdFNTKShFeGVjU3RhdGUqLCBTdHJ1Y3R1cmUqLCBzaXplX3QsIHNpemVfdCk7Cit0eXBlZGVm IGNoYXIqIERGR19PUEVSQVRJT04gKCpQX0RGR09wZXJhdGlvbl9FU3RaKShFeGVjU3RhdGUqLCBT dHJ1Y3R1cmUqLCBpbnQzMl90KTsKIAogLy8gVGhlc2Ugcm91dGluZXMgYXJlIHByb3ZpZGUgY2Fs bGJhY2tzIG91dCB0byBDKysgaW1wbGVtZW50YXRpb25zIG9mIG9wZXJhdGlvbnMgdG9vIGNvbXBs ZXggdG8gSklULgogSlNDZWxsKiBERkdfT1BFUkFUSU9OIG9wZXJhdGlvbk5ld09iamVjdChFeGVj U3RhdGUqKSBXVEZfSU5URVJOQUw7CkBAIC0xMzcsMTAgKzEzNywxMCBAQCBFbmNvZGVkSlNWYWx1 ZSBERkdfT1BFUkFUSU9OIG9wZXJhdGlvblJlCiBFbmNvZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9O IG9wZXJhdGlvblJlc29sdmVHbG9iYWwoRXhlY1N0YXRlKiwgR2xvYmFsUmVzb2x2ZUluZm8qLCBK U0dsb2JhbE9iamVjdCosIElkZW50aWZpZXIqKSBXVEZfSU5URVJOQUw7CiBFbmNvZGVkSlNWYWx1 ZSBERkdfT1BFUkFUSU9OIG9wZXJhdGlvblRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSosIEVuY29kZWRK U1ZhbHVlKSBXVEZfSU5URVJOQUw7CiBFbmNvZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9OIG9wZXJh dGlvblN0ckNhdChFeGVjU3RhdGUqLCB2b2lkKiwgc2l6ZV90KSBXVEZfSU5URVJOQUw7Ci1FbmNv ZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9OIG9wZXJhdGlvbk5ld0FycmF5KEV4ZWNTdGF0ZSosIFN0 cnVjdHVyZSosIHZvaWQqLCBzaXplX3QpIFdURl9JTlRFUk5BTDsKLUVuY29kZWRKU1ZhbHVlIERG R19PUEVSQVRJT04gb3BlcmF0aW9uTmV3QXJyYXlCdWZmZXIoRXhlY1N0YXRlKiwgU3RydWN0dXJl Kiwgc2l6ZV90LCBzaXplX3QpIFdURl9JTlRFUk5BTDsKLUVuY29kZWRKU1ZhbHVlIERGR19PUEVS QVRJT04gb3BlcmF0aW9uTmV3RW1wdHlBcnJheShFeGVjU3RhdGUqLCBTdHJ1Y3R1cmUqKSBXVEZf SU5URVJOQUw7Ci1FbmNvZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9OIG9wZXJhdGlvbk5ld0FycmF5 V2l0aFNpemUoRXhlY1N0YXRlKiwgU3RydWN0dXJlKiwgaW50MzJfdCkgV1RGX0lOVEVSTkFMOwor Y2hhciogREZHX09QRVJBVElPTiBvcGVyYXRpb25OZXdBcnJheShFeGVjU3RhdGUqLCBTdHJ1Y3R1 cmUqLCB2b2lkKiwgc2l6ZV90KSBXVEZfSU5URVJOQUw7CitjaGFyKiBERkdfT1BFUkFUSU9OIG9w ZXJhdGlvbk5ld0FycmF5QnVmZmVyKEV4ZWNTdGF0ZSosIFN0cnVjdHVyZSosIHNpemVfdCwgc2l6 ZV90KSBXVEZfSU5URVJOQUw7CitjaGFyKiBERkdfT1BFUkFUSU9OIG9wZXJhdGlvbk5ld0VtcHR5 QXJyYXkoRXhlY1N0YXRlKiwgU3RydWN0dXJlKikgV1RGX0lOVEVSTkFMOworY2hhciogREZHX09Q RVJBVElPTiBvcGVyYXRpb25OZXdBcnJheVdpdGhTaXplKEV4ZWNTdGF0ZSosIFN0cnVjdHVyZSos IGludDMyX3QpIFdURl9JTlRFUk5BTDsKIEVuY29kZWRKU1ZhbHVlIERGR19PUEVSQVRJT04gb3Bl cmF0aW9uTmV3UmVnZXhwKEV4ZWNTdGF0ZSosIHZvaWQqKSBXVEZfSU5URVJOQUw7CiB2b2lkIERG R19PUEVSQVRJT04gb3BlcmF0aW9uUHV0QnlWYWxTdHJpY3QoRXhlY1N0YXRlKiwgRW5jb2RlZEpT VmFsdWUgZW5jb2RlZEJhc2UsIEVuY29kZWRKU1ZhbHVlIGVuY29kZWRQcm9wZXJ0eSwgRW5jb2Rl ZEpTVmFsdWUgZW5jb2RlZFZhbHVlKSBXVEZfSU5URVJOQUw7CiB2b2lkIERGR19PUEVSQVRJT04g b3BlcmF0aW9uUHV0QnlWYWxOb25TdHJpY3QoRXhlY1N0YXRlKiwgRW5jb2RlZEpTVmFsdWUgZW5j b2RlZEJhc2UsIEVuY29kZWRKU1ZhbHVlIGVuY29kZWRQcm9wZXJ0eSwgRW5jb2RlZEpTVmFsdWUg ZW5jb2RlZFZhbHVlKSBXVEZfSU5URVJOQUw7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAJKHJldmlzaW9uIDEzMTA4 NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTM1MTYsMTAgKzM1MTYsOCBAQCB2b2lkIFNwZWN1bGF0aXZl SklUOjpjb21waWxlKE5vZGUmIG5vZGUpCiAgICAgICAgIGlmICghbm9kZS5udW1DaGlsZHJlbigp KSB7CiAgICAgICAgICAgICBmbHVzaFJlZ2lzdGVycygpOwogICAgICAgICAgICAgR1BSUmVzdWx0 IHJlc3VsdCh0aGlzKTsKLSAgICAgICAgICAgIEdQUlJlc3VsdDIgcmVzdWx0VGFnSWdub3JlZCh0 aGlzKTsKICAgICAgICAgICAgIGNhbGxPcGVyYXRpb24oCi0gICAgICAgICAgICAgICAgb3BlcmF0 aW9uTmV3RW1wdHlBcnJheSwgcmVzdWx0VGFnSWdub3JlZC5ncHIoKSwgcmVzdWx0LmdwcigpLAot ICAgICAgICAgICAgICAgIGdsb2JhbE9iamVjdC0+YXJyYXlTdHJ1Y3R1cmUoKSk7CisgICAgICAg ICAgICAgICAgb3BlcmF0aW9uTmV3RW1wdHlBcnJheSwgcmVzdWx0LmdwcigpLCBnbG9iYWxPYmpl Y3QtPmFycmF5U3RydWN0dXJlKCkpOwogICAgICAgICAgICAgY2VsbFJlc3VsdChyZXN1bHQuZ3By KCksIG1fY29tcGlsZUluZGV4KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CkBAIC0z NTQ4LDExICszNTQ2LDEwIEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSYgbm9k ZSkKICAgICAgICAgICAgIG1faml0LnN0b3JlUHRyKFRydXN0ZWRJbW1QdHIoc2NyYXRjaFNpemUp LCBzY3JhdGNoLmdwcigpKTsKICAgICAgICAgfQogCi0gICAgICAgIEdQUlJlc3VsdCByZXN1bHRQ YXlsb2FkKHRoaXMpOwotICAgICAgICBHUFJSZXN1bHQyIHJlc3VsdFRhZyh0aGlzKTsKKyAgICAg ICAgR1BSUmVzdWx0IHJlc3VsdCh0aGlzKTsKICAgICAgICAgCiAgICAgICAgIGNhbGxPcGVyYXRp b24oCi0gICAgICAgICAgICBvcGVyYXRpb25OZXdBcnJheSwgcmVzdWx0VGFnLmdwcigpLCByZXN1 bHRQYXlsb2FkLmdwcigpLCBnbG9iYWxPYmplY3QtPmFycmF5U3RydWN0dXJlKCksCisgICAgICAg ICAgICBvcGVyYXRpb25OZXdBcnJheSwgcmVzdWx0LmdwcigpLCBnbG9iYWxPYmplY3QtPmFycmF5 U3RydWN0dXJlKCksCiAgICAgICAgICAgICBzdGF0aWNfY2FzdDx2b2lkICo+KGJ1ZmZlciksIG5v ZGUubnVtQ2hpbGRyZW4oKSk7CiAKICAgICAgICAgaWYgKHNjcmF0Y2hTaXplKSB7CkBAIC0zNTYy LDggKzM1NTksNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUmIG5vZGUpCiAg ICAgICAgICAgICBtX2ppdC5zdG9yZVB0cihUcnVzdGVkSW1tUHRyKDApLCBzY3JhdGNoLmdwcigp KTsKICAgICAgICAgfQogCi0gICAgICAgIC8vIEZJWE1FOiBtYWtlIHRoZSBjYWxsT3BlcmF0aW9u IGFib3ZlIGV4cGxpY2l0bHkgcmV0dXJuIGEgY2VsbCByZXN1bHQsIG9yIGppdEFzc2VydCB0aGUg dGFnIGlzIGEgY2VsbCB0YWcuCi0gICAgICAgIGNlbGxSZXN1bHQocmVzdWx0UGF5bG9hZC5ncHIo KSwgbV9jb21waWxlSW5kZXgsIFVzZUNoaWxkcmVuQ2FsbGVkRXhwbGljaXRseSk7CisgICAgICAg IGNlbGxSZXN1bHQocmVzdWx0LmdwcigpLCBtX2NvbXBpbGVJbmRleCwgVXNlQ2hpbGRyZW5DYWxs ZWRFeHBsaWNpdGx5KTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogCkBAIC0zNTc2LDEwICszNTcy LDggQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShOb2RlJiBub2RlKQogICAgICAgICBH UFJSZWcgc2l6ZUdQUiA9IHNpemUuZ3ByKCk7CiAgICAgICAgIGZsdXNoUmVnaXN0ZXJzKCk7CiAg ICAgICAgIEdQUlJlc3VsdCByZXN1bHQodGhpcyk7Ci0gICAgICAgIEdQUlJlc3VsdDIgcmVzdWx0 VGFnSWdub3JlZCh0aGlzKTsKICAgICAgICAgY2FsbE9wZXJhdGlvbigKLSAgICAgICAgICAgIG9w ZXJhdGlvbk5ld0FycmF5V2l0aFNpemUsIHJlc3VsdFRhZ0lnbm9yZWQuZ3ByKCksIHJlc3VsdC5n cHIoKSwKLSAgICAgICAgICAgIGdsb2JhbE9iamVjdC0+YXJyYXlTdHJ1Y3R1cmUoKSwgc2l6ZUdQ Uik7CisgICAgICAgICAgICBvcGVyYXRpb25OZXdBcnJheVdpdGhTaXplLCByZXN1bHQuZ3ByKCks IGdsb2JhbE9iamVjdC0+YXJyYXlTdHJ1Y3R1cmUoKSwgc2l6ZUdQUik7CiAgICAgICAgIGNlbGxS ZXN1bHQocmVzdWx0LmdwcigpLCBtX2NvbXBpbGVJbmRleCk7CiAgICAgICAgIGJyZWFrOwogICAg IH0KQEAgLTM1OTAsMTMgKzM1ODQsMTEgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShO b2RlJiBub2RlKQogICAgICAgICAgICAgZ2xvYmFsT2JqZWN0LT5oYXZpbmdBQmFkVGltZVdhdGNo cG9pbnQoKS0+YWRkKHNwZWN1bGF0aW9uV2F0Y2hwb2ludCgpKTsKICAgICAgICAgCiAgICAgICAg IGZsdXNoUmVnaXN0ZXJzKCk7Ci0gICAgICAgIEdQUlJlc3VsdCByZXN1bHRQYXlsb2FkKHRoaXMp OwotICAgICAgICBHUFJSZXN1bHQyIHJlc3VsdFRhZyh0aGlzKTsKKyAgICAgICAgR1BSUmVzdWx0 IHJlc3VsdCh0aGlzKTsKICAgICAgICAgCi0gICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9u TmV3QXJyYXlCdWZmZXIsIHJlc3VsdFRhZy5ncHIoKSwgcmVzdWx0UGF5bG9hZC5ncHIoKSwgZ2xv YmFsT2JqZWN0LT5hcnJheVN0cnVjdHVyZSgpLCBub2RlLnN0YXJ0Q29uc3RhbnQoKSwgbm9kZS5u dW1Db25zdGFudHMoKSk7CisgICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uTmV3QXJyYXlC dWZmZXIsIHJlc3VsdC5ncHIoKSwgZ2xvYmFsT2JqZWN0LT5hcnJheVN0cnVjdHVyZSgpLCBub2Rl LnN0YXJ0Q29uc3RhbnQoKSwgbm9kZS5udW1Db25zdGFudHMoKSk7CiAgICAgICAgIAotICAgICAg ICAvLyBGSVhNRTogbWFrZSB0aGUgY2FsbE9wZXJhdGlvbiBhYm92ZSBleHBsaWNpdGx5IHJldHVy biBhIGNlbGwgcmVzdWx0LCBvciBqaXRBc3NlcnQgdGhlIHRhZyBpcyBhIGNlbGwgdGFnLgotICAg ICAgICBjZWxsUmVzdWx0KHJlc3VsdFBheWxvYWQuZ3ByKCksIG1fY29tcGlsZUluZGV4KTsKKyAg ICAgICAgY2VsbFJlc3VsdChyZXN1bHQuZ3ByKCksIG1fY29tcGlsZUluZGV4KTsKICAgICAgICAg YnJlYWs7CiAgICAgfQogICAgICAgICAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHU3BlY3VsYXRpdmVKSVQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR1NwZWN1bGF0aXZlSklULmgJKHJldmlzaW9uIDEzMTA4NykKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuaAkod29ya2luZyBjb3B5KQpAQCAtMTIx OSwyNyArMTIxOSwyNyBAQCBwdWJsaWM6CiAgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0 aEV4ZWNTdGF0ZShhcmcxLCBhcmcyKTsKICAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxXaXRoRXhj ZXB0aW9uQ2hlY2tTZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1bHQpOwogICAgIH0KLSAgICBKSVRD b21waWxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKEpfREZHT3BlcmF0aW9uX0VTdCBvcGVyYXRpb24s IEdQUlJlZyByZXN1bHQsIFN0cnVjdHVyZSogc3RydWN0dXJlKQorICAgIEpJVENvbXBpbGVyOjpD YWxsIGNhbGxPcGVyYXRpb24oUF9ERkdPcGVyYXRpb25fRVN0IG9wZXJhdGlvbiwgR1BSUmVnIHJl c3VsdCwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUpCiAgICAgewogICAgICAgICBtX2ppdC5zZXR1cEFy Z3VtZW50c1dpdGhFeGVjU3RhdGUoVHJ1c3RlZEltbVB0cihzdHJ1Y3R1cmUpKTsKICAgICAgICAg cmV0dXJuIGFwcGVuZENhbGxXaXRoRXhjZXB0aW9uQ2hlY2tTZXRSZXN1bHQob3BlcmF0aW9uLCBy ZXN1bHQpOwogICAgIH0KLSAgICBKSVRDb21waWxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKEpfREZH T3BlcmF0aW9uX0VTdFogb3BlcmF0aW9uLCBHUFJSZWcgcmVzdWx0LCBTdHJ1Y3R1cmUqIHN0cnVj dHVyZSwgR1BSUmVnIGFyZzIpCisgICAgSklUQ29tcGlsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihQ X0RGR09wZXJhdGlvbl9FU3RaIG9wZXJhdGlvbiwgR1BSUmVnIHJlc3VsdCwgU3RydWN0dXJlKiBz dHJ1Y3R1cmUsIEdQUlJlZyBhcmcyKQogICAgIHsKICAgICAgICAgbV9qaXQuc2V0dXBBcmd1bWVu dHNXaXRoRXhlY1N0YXRlKFRydXN0ZWRJbW1QdHIoc3RydWN0dXJlKSwgYXJnMik7CiAgICAgICAg IHJldHVybiBhcHBlbmRDYWxsV2l0aEV4Y2VwdGlvbkNoZWNrU2V0UmVzdWx0KG9wZXJhdGlvbiwg cmVzdWx0KTsKICAgICB9Ci0gICAgSklUQ29tcGlsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihKX0RG R09wZXJhdGlvbl9FU3RaIG9wZXJhdGlvbiwgR1BSUmVnIHJlc3VsdCwgR1BSUmVnIGFyZzEsIEdQ UlJlZyBhcmcyKQorICAgIEpJVENvbXBpbGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oUF9ERkdPcGVy YXRpb25fRVN0WiBvcGVyYXRpb24sIEdQUlJlZyByZXN1bHQsIEdQUlJlZyBhcmcxLCBHUFJSZWcg YXJnMikKICAgICB7CiAgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShh cmcxLCBhcmcyKTsKICAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxXaXRoRXhjZXB0aW9uQ2hlY2tT ZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1bHQpOwogICAgIH0KLSAgICBKSVRDb21waWxlcjo6Q2Fs bCBjYWxsT3BlcmF0aW9uKEpfREZHT3BlcmF0aW9uX0VTdFBTIG9wZXJhdGlvbiwgR1BSUmVnIHJl c3VsdCwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIHZvaWQqIHBvaW50ZXIsIHNpemVfdCBzaXplKQor ICAgIEpJVENvbXBpbGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oUF9ERkdPcGVyYXRpb25fRVN0UFMg b3BlcmF0aW9uLCBHUFJSZWcgcmVzdWx0LCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgdm9pZCogcG9p bnRlciwgc2l6ZV90IHNpemUpCiAgICAgewogICAgICAgICBtX2ppdC5zZXR1cEFyZ3VtZW50c1dp dGhFeGVjU3RhdGUoVHJ1c3RlZEltbVB0cihzdHJ1Y3R1cmUpLCBUcnVzdGVkSW1tUHRyKHBvaW50 ZXIpLCBUcnVzdGVkSW1tUHRyKHNpemUpKTsKICAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxXaXRo RXhjZXB0aW9uQ2hlY2tTZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1bHQpOwogICAgIH0KLSAgICBK SVRDb21waWxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKEpfREZHT3BlcmF0aW9uX0VTdFNTIG9wZXJh dGlvbiwgR1BSUmVnIHJlc3VsdCwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIHNpemVfdCBpbmRleCwg c2l6ZV90IHNpemUpCisgICAgSklUQ29tcGlsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihQX0RGR09w ZXJhdGlvbl9FU3RTUyBvcGVyYXRpb24sIEdQUlJlZyByZXN1bHQsIFN0cnVjdHVyZSogc3RydWN0 dXJlLCBzaXplX3QgaW5kZXgsIHNpemVfdCBzaXplKQogICAgIHsKICAgICAgICAgbV9qaXQuc2V0 dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRlKFRydXN0ZWRJbW1QdHIoc3RydWN0dXJlKSwgVHJ1c3Rl ZEltbVB0cihpbmRleCksIFRydXN0ZWRJbW1QdHIoc2l6ZSkpOwogICAgICAgICByZXR1cm4gYXBw ZW5kQ2FsbFdpdGhFeGNlcHRpb25DaGVja1NldFJlc3VsdChvcGVyYXRpb24sIHJlc3VsdCk7CkBA IC0xNTQ3LDMwICsxNTQ3LDMwIEBAIHB1YmxpYzoKICAgICAgICAgbV9qaXQuc2V0dXBBcmd1bWVu dHNXaXRoRXhlY1N0YXRlKGFyZzEsIGFyZzIpOwogICAgICAgICByZXR1cm4gYXBwZW5kQ2FsbFdp dGhFeGNlcHRpb25DaGVja1NldFJlc3VsdChvcGVyYXRpb24sIHJlc3VsdFBheWxvYWQsIHJlc3Vs dFRhZyk7CiAgICAgfQotICAgIEpJVENvbXBpbGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oSl9ERkdP cGVyYXRpb25fRVN0IG9wZXJhdGlvbiwgR1BSUmVnIHJlc3VsdFRhZywgR1BSUmVnIHJlc3VsdFBh eWxvYWQsIFN0cnVjdHVyZSogc3RydWN0dXJlKQorICAgIEpJVENvbXBpbGVyOjpDYWxsIGNhbGxP cGVyYXRpb24oUF9ERkdPcGVyYXRpb25fRVN0IG9wZXJhdGlvbiwgR1BSUmVnIHJlc3VsdCwgU3Ry dWN0dXJlKiBzdHJ1Y3R1cmUpCiAgICAgewogICAgICAgICBtX2ppdC5zZXR1cEFyZ3VtZW50c1dp dGhFeGVjU3RhdGUoVHJ1c3RlZEltbVB0cihzdHJ1Y3R1cmUpKTsKLSAgICAgICAgcmV0dXJuIGFw cGVuZENhbGxXaXRoRXhjZXB0aW9uQ2hlY2tTZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1bHRQYXls b2FkLCByZXN1bHRUYWcpOworICAgICAgICByZXR1cm4gYXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25D aGVja1NldFJlc3VsdChvcGVyYXRpb24sIHJlc3VsdCk7CiAgICAgfQotICAgIEpJVENvbXBpbGVy OjpDYWxsIGNhbGxPcGVyYXRpb24oSl9ERkdPcGVyYXRpb25fRVN0WiBvcGVyYXRpb24sIEdQUlJl ZyByZXN1bHRUYWcsIEdQUlJlZyByZXN1bHRQYXlsb2FkLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwg R1BSUmVnIGFyZzIpCisgICAgSklUQ29tcGlsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihQX0RGR09w ZXJhdGlvbl9FU3RaIG9wZXJhdGlvbiwgR1BSUmVnIHJlc3VsdCwgU3RydWN0dXJlKiBzdHJ1Y3R1 cmUsIEdQUlJlZyBhcmcyKQogICAgIHsKICAgICAgICAgbV9qaXQuc2V0dXBBcmd1bWVudHNXaXRo RXhlY1N0YXRlKFRydXN0ZWRJbW1QdHIoc3RydWN0dXJlKSwgYXJnMik7Ci0gICAgICAgIHJldHVy biBhcHBlbmRDYWxsV2l0aEV4Y2VwdGlvbkNoZWNrU2V0UmVzdWx0KG9wZXJhdGlvbiwgcmVzdWx0 UGF5bG9hZCwgcmVzdWx0VGFnKTsKKyAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxXaXRoRXhjZXB0 aW9uQ2hlY2tTZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1bHQpOwogICAgIH0KLSAgICBKSVRDb21w aWxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKEpfREZHT3BlcmF0aW9uX0VTdFogb3BlcmF0aW9uLCBH UFJSZWcgcmVzdWx0VGFnLCBHUFJSZWcgcmVzdWx0UGF5bG9hZCwgR1BSUmVnIGFyZzEsIEdQUlJl ZyBhcmcyKQorICAgIEpJVENvbXBpbGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oUF9ERkdPcGVyYXRp b25fRVN0WiBvcGVyYXRpb24sIEdQUlJlZyByZXN1bHQsIEdQUlJlZyBhcmcxLCBHUFJSZWcgYXJn MikKICAgICB7CiAgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShhcmcx LCBhcmcyKTsKLSAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxXaXRoRXhjZXB0aW9uQ2hlY2tTZXRS ZXN1bHQob3BlcmF0aW9uLCByZXN1bHRQYXlsb2FkLCByZXN1bHRUYWcpOworICAgICAgICByZXR1 cm4gYXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25DaGVja1NldFJlc3VsdChvcGVyYXRpb24sIHJlc3Vs dCk7CiAgICAgfQotICAgIEpJVENvbXBpbGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oSl9ERkdPcGVy YXRpb25fRVN0UFMgb3BlcmF0aW9uLCBHUFJSZWcgcmVzdWx0VGFnLCBHUFJSZWcgcmVzdWx0UGF5 bG9hZCwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIHZvaWQqIHBvaW50ZXIsIHNpemVfdCBzaXplKQor ICAgIEpJVENvbXBpbGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oUF9ERkdPcGVyYXRpb25fRVN0UFMg b3BlcmF0aW9uLCBHUFJSZWcgcmVzdWx0LCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgdm9pZCogcG9p bnRlciwgc2l6ZV90IHNpemUpCiAgICAgewogICAgICAgICBtX2ppdC5zZXR1cEFyZ3VtZW50c1dp dGhFeGVjU3RhdGUoVHJ1c3RlZEltbVB0cihzdHJ1Y3R1cmUpLCBUcnVzdGVkSW1tUHRyKHBvaW50 ZXIpLCBUcnVzdGVkSW1tUHRyKHNpemUpKTsKLSAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxXaXRo RXhjZXB0aW9uQ2hlY2tTZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1bHRQYXlsb2FkLCByZXN1bHRU YWcpOworICAgICAgICByZXR1cm4gYXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25DaGVja1NldFJlc3Vs dChvcGVyYXRpb24sIHJlc3VsdCk7CiAgICAgfQotICAgIEpJVENvbXBpbGVyOjpDYWxsIGNhbGxP cGVyYXRpb24oSl9ERkdPcGVyYXRpb25fRVN0U1Mgb3BlcmF0aW9uLCBHUFJSZWcgcmVzdWx0VGFn LCBHUFJSZWcgcmVzdWx0UGF5bG9hZCwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIHNpemVfdCBpbmRl eCwgc2l6ZV90IHNpemUpCisgICAgSklUQ29tcGlsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihQX0RG R09wZXJhdGlvbl9FU3RTUyBvcGVyYXRpb24sIEdQUlJlZyByZXN1bHQsIFN0cnVjdHVyZSogc3Ry dWN0dXJlLCBzaXplX3QgaW5kZXgsIHNpemVfdCBzaXplKQogICAgIHsKICAgICAgICAgbV9qaXQu c2V0dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRlKFRydXN0ZWRJbW1QdHIoc3RydWN0dXJlKSwgVHJ1 c3RlZEltbVB0cihpbmRleCksIFRydXN0ZWRJbW1QdHIoc2l6ZSkpOwotICAgICAgICByZXR1cm4g YXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25DaGVja1NldFJlc3VsdChvcGVyYXRpb24sIHJlc3VsdFBh eWxvYWQsIHJlc3VsdFRhZyk7CisgICAgICAgIHJldHVybiBhcHBlbmRDYWxsV2l0aEV4Y2VwdGlv bkNoZWNrU2V0UmVzdWx0KG9wZXJhdGlvbiwgcmVzdWx0KTsKICAgICB9CiAgICAgSklUQ29tcGls ZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihKX0RGR09wZXJhdGlvbl9FUFMgb3BlcmF0aW9uLCBHUFJS ZWcgcmVzdWx0VGFnLCBHUFJSZWcgcmVzdWx0UGF5bG9hZCwgdm9pZCogcG9pbnRlciwgc2l6ZV90 IHNpemUpCiAgICAgewo=