87079 2012-05-21 22:33:07 -0700 [V8] Replace 'throwError(); return Undefined();' with 'return throwError()' 2012-05-22 00:24:53 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 85330 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 629932 0 haraken 2012-05-21 22:33:07 -0700 We can replace throwError(); return v8::Undefined(); with return throwError(); 629933 1 143189 haraken 2012-05-21 22:36:09 -0700 Created attachment 143189 Patch 629994 2 143189 abarth 2012-05-21 23:50:04 -0700 Comment on attachment 143189 Patch So much prettier. 630031 3 143189 webkit.review.bot 2012-05-22 00:24:40 -0700 Comment on attachment 143189 Patch Clearing flags on attachment: 143189 Committed r117923: <http://trac.webkit.org/changeset/117923> 630032 4 webkit.review.bot 2012-05-22 00:24:53 -0700 All reviewed patches have been landed. Closing bug. 143189 2012-05-21 22:36:09 -0700 2012-05-22 00:24:40 -0700 Patch bug-87079-20120522143608.patch text/plain 13668 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3OTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjgyYzI1ZjY4MGU4ODI3 ZmM3YWVlZGQxZDkwYTIwZjBmNTYzYzRhNC4uYWNkMmM4ZTZkZWY3ZGQ0NWJmYjYwNDVlNjE0ZDFi YTFlMmE0MTFmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEyLTA1LTIxICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFJlcGxhY2Ug J3Rocm93RXJyb3IoKTsgcmV0dXJuIFVuZGVmaW5lZCgpOycgd2l0aCAncmV0dXJuIHRocm93RXJy b3IoKScKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3 MDc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhp cyBwYXRjaCByZXBsYWNlcworCisgICAgICAgICAgICB0aHJvd0Vycm9yKCk7CisgICAgICAgICAg ICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOworCisgICAgICAgIHdpdGgKKworICAgICAgICAgICAg cmV0dXJuIHRocm93RXJyb3IoKTsKKworICAgICAgICBObyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJl aGF2aW9yLgorCisgICAgICAgICogYmluZGluZ3MvdjgvRGF0ZUV4dGVuc2lvbi5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpEYXRlRXh0ZW5zaW9uOjpPblNsZWVwRGV0ZWN0ZWQpOgorICAgICAgICAq IGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxEb2N1bWVudEN1c3RvbS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpWOEhUTUxEb2N1bWVudDo6b3BlbkNhbGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5n cy92OC9jdXN0b20vVjhJbmplY3RlZFNjcmlwdEhvc3RDdXN0b20uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6VjhJbmplY3RlZFNjcmlwdEhvc3Q6Omluc3BlY3RlZE9iamVjdENhbGxiYWNrKToKKyAg ICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhTUUxSZXN1bHRTZXRSb3dMaXN0Q3VzdG9tLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlY4U1FMUmVzdWx0U2V0Um93TGlzdDo6aXRlbUNhbGxiYWNr KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhXZWJHTFJlbmRlcmluZ0NvbnRleHRD dXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhXZWJHTFJlbmRlcmluZ0NvbnRleHQ6Omdl dEF0dGFjaGVkU2hhZGVyc0NhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OlY4V2ViR0xSZW5k ZXJpbmdDb250ZXh0OjpnZXRQcm9ncmFtUGFyYW1ldGVyQ2FsbGJhY2spOgorICAgICAgICAoV2Vi Q29yZTo6VjhXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmdldFNoYWRlclBhcmFtZXRlckNhbGxiYWNr KToKKyAgICAgICAgKFdlYkNvcmU6OlY4V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpnZXRVbmlmb3Jt Q2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6dmVydGV4QXR0cmliQW5kVW5pZm9ybUhlbHBl cmYpOgorICAgICAgICAoV2ViQ29yZTo6dW5pZm9ybUhlbHBlcmkpOgorICAgICAgICAoV2ViQ29y ZTo6dW5pZm9ybU1hdHJpeEhlbHBlcik6CisKIDIwMTItMDUtMjEgIEhhamltZSBNb3JyaXRhICA8 bW9ycml0YUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBRdCBidWlsZCBmaXgg YWdhaW5zdCByMTE3ODk4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv RGF0ZUV4dGVuc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9EYXRlRXh0ZW5z aW9uLmNwcAppbmRleCA4ODNkZmQzYTI3ZWNiNTgwYjdiZjY2ZjI0Mzk4MDAwOGYxODMyZGVlLi44 ZDM0Y2I4YjVmZjczYjhmYmEwZmZjMDVlNGRhOTM5YTM0MzE1OWZmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9EYXRlRXh0ZW5zaW9uLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9EYXRlRXh0ZW5zaW9uLmNwcApAQCAtMTE4LDggKzExOCw3IEBAIHY4 OjpIYW5kbGU8djg6OlZhbHVlPiBEYXRlRXh0ZW5zaW9uOjpTZXR1cChjb25zdCB2ODo6QXJndW1l bnRzJiBhcmdzKQogCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gRGF0ZUV4dGVuc2lvbjo6T25TbGVl cERldGVjdGVkKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCiB7Ci0gICAgVjhQcm94eTo6dGhy b3dFcnJvcihWOFByb3h5OjpHZW5lcmFsRXJyb3IsICJUb28gbXVjaCB0aW1lIHNwZW50IGluIHVu bG9hZCBoYW5kbGVyLiIsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKLSAgICByZXR1cm4gdjg6OlVuZGVm aW5lZCgpOworICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd0Vycm9yKFY4UHJveHk6OkdlbmVyYWxF cnJvciwgIlRvbyBtdWNoIHRpbWUgc3BlbnQgaW4gdW5sb2FkIGhhbmRsZXIuIiwgYXJncy5HZXRJ c29sYXRlKCkpOwogfQogCiB9ICAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTERvY3VtZW50Q3VzdG9tLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxEb2N1bWVudEN1c3RvbS5j cHAKaW5kZXggMDZlMTY1ZTQ5OWE0YTc1MDkxMTUwOGQwYjczOTQ5NTg5ZDA3NmU3Yy4uMWJkOTdk NjgyNDNkNWM3MGY2ZTU0ZGFjZDAxYmFlODA2OTdkZTNhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTERvY3VtZW50Q3VzdG9tLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MRG9jdW1lbnRDdXN0b20uY3Bw CkBAIC0xNDgsMTAgKzE0OCw4IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOEhUTUxEb2N1bWVu dDo6b3BlbkNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCiAgICAgICAgICAgICAv LyBHZXQgdGhlIG9wZW4gcHJvcGVydHkgb2YgdGhlIGdsb2JhbCBvYmplY3QuCiAgICAgICAgICAg ICB2ODo6TG9jYWw8djg6OlZhbHVlPiBmdW5jdGlvbiA9IGdsb2JhbC0+R2V0KHY4OjpTdHJpbmc6 Ok5ldygib3BlbiIpKTsKICAgICAgICAgICAgIC8vIElmIHRoZSBvcGVuIHByb3BlcnR5IGlzIG5v dCBhIGZ1bmN0aW9uIHRocm93IGEgdHlwZSBlcnJvci4KLSAgICAgICAgICAgIGlmICghZnVuY3Rp b24tPklzRnVuY3Rpb24oKSkgewotICAgICAgICAgICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVy cm9yKCJvcGVuIGlzIG5vdCBhIGZ1bmN0aW9uIik7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHY4 OjpVbmRlZmluZWQoKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmICghZnVuY3Rpb24t PklzRnVuY3Rpb24oKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dUeXBl RXJyb3IoIm9wZW4gaXMgbm90IGEgZnVuY3Rpb24iKTsKICAgICAgICAgICAgIC8vIFdyYXAgdXAg dGhlIGFyZ3VtZW50cyBhbmQgY2FsbCB0aGUgZnVuY3Rpb24uCiAgICAgICAgICAgICBPd25BcnJh eVB0cjx2ODo6TG9jYWw8djg6OlZhbHVlPiA+IHBhcmFtcyA9IGFkb3B0QXJyYXlQdHIobmV3IHY4 OjpMb2NhbDx2ODo6VmFsdWU+W2FyZ3MuTGVuZ3RoKCldKTsKICAgICAgICAgICAgIGZvciAoaW50 IGkgPSAwOyBpIDwgYXJncy5MZW5ndGgoKTsgaSsrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SW5qZWN0ZWRTY3JpcHRIb3N0Q3VzdG9tLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEluamVjdGVkU2NyaXB0SG9zdEN1c3Rv bS5jcHAKaW5kZXggOWY5NzgwYzdkOTliOTJjZGFlNmY3NDI1NjZlYTA1OTYwYzM5MDkyZC4uMmEw OGRkMTMyNzVjMDg3NGY1ZTVlZjljYmQxYmNjOTQzMGI2NTc5ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SW5qZWN0ZWRTY3JpcHRIb3N0Q3VzdG9tLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhJbmplY3RlZFNjcmlw dEhvc3RDdXN0b20uY3BwCkBAIC04MiwxMCArODIsOCBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g VjhJbmplY3RlZFNjcmlwdEhvc3Q6Omluc3BlY3RlZE9iamVjdENhbGxiYWNrKGNvbnN0IHY4OjpB cgogICAgIGlmIChhcmdzLkxlbmd0aCgpIDwgMSkKICAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmlu ZWQoKTsKIAotICAgIGlmICghYXJnc1swXS0+SXNJbnQzMigpKSB7Ci0gICAgICAgIFY4UHJveHk6 OnRocm93VHlwZUVycm9yKCJhcmd1bWVudCBoYXMgdG8gYmUgYW4gaW50ZWdlciIpOwotICAgICAg ICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwotICAgIH0KKyAgICBpZiAoIWFyZ3NbMF0tPklzSW50 MzIoKSkKKyAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCJhcmd1bWVudCBo YXMgdG8gYmUgYW4gaW50ZWdlciIpOwogCiAgICAgSW5qZWN0ZWRTY3JpcHRIb3N0KiBob3N0ID0g VjhJbmplY3RlZFNjcmlwdEhvc3Q6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOwogICAgIEluamVj dGVkU2NyaXB0SG9zdDo6SW5zcGVjdGFibGVPYmplY3QqIG9iamVjdCA9IGhvc3QtPmluc3BlY3Rl ZE9iamVjdChhcmdzWzBdLT5Ub0ludDMyKCktPlZhbHVlKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4U1FMUmVzdWx0U2V0Um93TGlzdEN1c3RvbS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhTUUxSZXN1bHRTZXRSb3dM aXN0Q3VzdG9tLmNwcAppbmRleCBmNzkzNmVjNjYzZDUwMDQzY2MyMmMyMDE2MTI2NjE2Nzk2ZmI1 NTFhLi5lOGE3NjNiOWFmYTk1Yzg4N2ZmZmQxMWJjMzg1NGM2MjAwNjBkZjhkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhTUUxSZXN1bHRTZXRSb3dMaXN0 Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhTUUxS ZXN1bHRTZXRSb3dMaXN0Q3VzdG9tLmNwcApAQCAtNDMsMjMgKzQzLDE3IEBAIHY4OjpIYW5kbGU8 djg6OlZhbHVlPiBWOFNRTFJlc3VsdFNldFJvd0xpc3Q6Oml0ZW1DYWxsYmFjayhjb25zdCB2ODo6 QXJndW1lbnRzJiBhCiB7CiAgICAgSU5DX1NUQVRTKCJET00uU1FMUmVzdWx0U2V0Um93TGlzdC5p dGVtKCkiKTsKIAotICAgIGlmIChhcmdzLkxlbmd0aCgpID09IDApIHsKLSAgICAgICAgVjhQcm94 eTo6dGhyb3dFcnJvcihWOFByb3h5OjpTeW50YXhFcnJvciwgIkl0ZW0gaW5kZXggaXMgcmVxdWly ZWQuIiwgYXJncy5HZXRJc29sYXRlKCkpOwotICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgp OwotICAgIH0KKyAgICBpZiAoIWFyZ3MuTGVuZ3RoKCkpCisgICAgICAgIHJldHVybiBWOFByb3h5 Ojp0aHJvd0Vycm9yKFY4UHJveHk6OlN5bnRheEVycm9yLCAiSXRlbSBpbmRleCBpcyByZXF1aXJl ZC4iLCBhcmdzLkdldElzb2xhdGUoKSk7CiAKLSAgICBpZiAoIWFyZ3NbMF0tPklzTnVtYmVyKCkp IHsKLSAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoIkl0ZW0gaW5kZXggbXVzdCBiZSBh IG51bWJlci4iKTsKLSAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKLSAgICB9CisgICAg aWYgKCFhcmdzWzBdLT5Jc051bWJlcigpKQorICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dU eXBlRXJyb3IoIkl0ZW0gaW5kZXggbXVzdCBiZSBhIG51bWJlci4iKTsKIAogICAgIFNRTFJlc3Vs dFNldFJvd0xpc3QqIHJvd0xpc3QgPSBWOFNRTFJlc3VsdFNldFJvd0xpc3Q6OnRvTmF0aXZlKGFy Z3MuSG9sZGVyKCkpOwogCiAgICAgdW5zaWduZWQgbG9uZyBpbmRleCA9IGFyZ3NbMF0tPkludGVn ZXJWYWx1ZSgpOwotICAgIGlmIChpbmRleCA+PSByb3dMaXN0LT5sZW5ndGgoKSkgewotICAgICAg ICBWOFByb3h5Ojp0aHJvd0Vycm9yKFY4UHJveHk6OlJhbmdlRXJyb3IsICJJdGVtIGluZGV4IGlz IG91dCBvZiByYW5nZS4iLCBhcmdzLkdldElzb2xhdGUoKSk7Ci0gICAgICAgIHJldHVybiB2ODo6 VW5kZWZpbmVkKCk7Ci0gICAgfQorICAgIGlmIChpbmRleCA+PSByb3dMaXN0LT5sZW5ndGgoKSkK KyAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRocm93RXJyb3IoVjhQcm94eTo6UmFuZ2VFcnJvciwg Ikl0ZW0gaW5kZXggaXMgb3V0IG9mIHJhbmdlLiIsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKIAogICAg IHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBpdGVtID0gdjg6Ok9iamVjdDo6TmV3KCk7CiAgICAgdW5z aWduZWQgbnVtQ29sdW1ucyA9IHJvd0xpc3QtPmNvbHVtbk5hbWVzKCkuc2l6ZSgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4V2ViR0xSZW5kZXJpbmdD b250ZXh0Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFdl YkdMUmVuZGVyaW5nQ29udGV4dEN1c3RvbS5jcHAKaW5kZXggYjAxOWI4NzNhZDQwMWZjYTBhZDIy NTQzM2ZjNjI1MjVmZDE4YjA5ZS4uZWU5ZDFhN2M0NjVjZjgxYzk4NzliZDMzNGY4NWFiNGMzMWZi MDJiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4V2Vi R0xSZW5kZXJpbmdDb250ZXh0Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9jdXN0b20vVjhXZWJHTFJlbmRlcmluZ0NvbnRleHRDdXN0b20uY3BwCkBAIC0yNzMsMTAg KzI3Myw4IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6 Z2V0QXR0YWNoZWRTaGFkZXJzQ2FsbGJhY2soY29uc3QKIAogICAgIEV4Y2VwdGlvbkNvZGUgZWMg PSAwOwogICAgIFdlYkdMUmVuZGVyaW5nQ29udGV4dCogY29udGV4dCA9IFY4V2ViR0xSZW5kZXJp bmdDb250ZXh0Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKLSAgICBpZiAoYXJncy5MZW5ndGgo KSA+IDAgJiYgIWlzVW5kZWZpbmVkT3JOdWxsKGFyZ3NbMF0pICYmICFWOFdlYkdMUHJvZ3JhbTo6 SGFzSW5zdGFuY2UoYXJnc1swXSkpIHsKLSAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3Io KTsKLSAgICAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpOwotICAgIH0KKyAgICBp ZiAoYXJncy5MZW5ndGgoKSA+IDAgJiYgIWlzVW5kZWZpbmVkT3JOdWxsKGFyZ3NbMF0pICYmICFW OFdlYkdMUHJvZ3JhbTo6SGFzSW5zdGFuY2UoYXJnc1swXSkpCisgICAgICAgIHJldHVybiBWOFBy b3h5Ojp0aHJvd1R5cGVFcnJvcigpOwogICAgIFdlYkdMUHJvZ3JhbSogcHJvZ3JhbSA9IFY4V2Vi R0xQcm9ncmFtOjpIYXNJbnN0YW5jZShhcmdzWzBdKSA/IFY4V2ViR0xQcm9ncmFtOjp0b05hdGl2 ZSh2ODo6SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0KGFyZ3NbMF0pKSA6IDA7CiAgICAgVmVjdG9y PFJlZlB0cjxXZWJHTFNoYWRlcj4gPiBzaGFkZXJzOwogICAgIGJvb2wgc3VjY2VlZCA9IGNvbnRl eHQtPmdldEF0dGFjaGVkU2hhZGVycyhwcm9ncmFtLCBzaGFkZXJzLCBlYyk7CkBAIC0zNTYsMTAg KzM1NCw4IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6 Z2V0UHJvZ3JhbVBhcmFtZXRlckNhbGxiYWNrKGNvbnN0CiAKICAgICBFeGNlcHRpb25Db2RlIGVj ID0gMDsKICAgICBXZWJHTFJlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQgPSBWOFdlYkdMUmVuZGVy aW5nQ29udGV4dDo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7Ci0gICAgaWYgKGFyZ3MuTGVuZ3Ro KCkgPiAwICYmICFpc1VuZGVmaW5lZE9yTnVsbChhcmdzWzBdKSAmJiAhVjhXZWJHTFByb2dyYW06 Okhhc0luc3RhbmNlKGFyZ3NbMF0pKSB7Ci0gICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9y KCk7Ci0gICAgICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKLSAgICB9CisgICAg aWYgKGFyZ3MuTGVuZ3RoKCkgPiAwICYmICFpc1VuZGVmaW5lZE9yTnVsbChhcmdzWzBdKSAmJiAh VjhXZWJHTFByb2dyYW06Okhhc0luc3RhbmNlKGFyZ3NbMF0pKQorICAgICAgICByZXR1cm4gVjhQ cm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKICAgICBXZWJHTFByb2dyYW0qIHByb2dyYW0gPSBWOFdl YkdMUHJvZ3JhbTo6SGFzSW5zdGFuY2UoYXJnc1swXSkgPyBWOFdlYkdMUHJvZ3JhbTo6dG9OYXRp dmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChhcmdzWzBdKSkgOiAwOwogICAgIHVuc2ln bmVkIHBuYW1lID0gdG9JbnQzMihhcmdzWzFdKTsKICAgICBXZWJHTEdldEluZm8gaW5mbyA9IGNv bnRleHQtPmdldFByb2dyYW1QYXJhbWV0ZXIocHJvZ3JhbSwgcG5hbWUsIGVjKTsKQEAgLTM4NSwx MCArMzgxLDggQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4V2ViR0xSZW5kZXJpbmdDb250ZXh0 OjpnZXRTaGFkZXJQYXJhbWV0ZXJDYWxsYmFjayhjb25zdAogCiAgICAgRXhjZXB0aW9uQ29kZSBl YyA9IDA7CiAgICAgV2ViR0xSZW5kZXJpbmdDb250ZXh0KiBjb250ZXh0ID0gVjhXZWJHTFJlbmRl cmluZ0NvbnRleHQ6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOwotICAgIGlmIChhcmdzLkxlbmd0 aCgpID4gMCAmJiAhaXNVbmRlZmluZWRPck51bGwoYXJnc1swXSkgJiYgIVY4V2ViR0xTaGFkZXI6 Okhhc0luc3RhbmNlKGFyZ3NbMF0pKSB7Ci0gICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9y KCk7Ci0gICAgICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKLSAgICB9CisgICAg aWYgKGFyZ3MuTGVuZ3RoKCkgPiAwICYmICFpc1VuZGVmaW5lZE9yTnVsbChhcmdzWzBdKSAmJiAh VjhXZWJHTFNoYWRlcjo6SGFzSW5zdGFuY2UoYXJnc1swXSkpCisgICAgICAgIHJldHVybiBWOFBy b3h5Ojp0aHJvd1R5cGVFcnJvcigpOwogICAgIFdlYkdMU2hhZGVyKiBzaGFkZXIgPSBWOFdlYkdM U2hhZGVyOjpIYXNJbnN0YW5jZShhcmdzWzBdKSA/IFY4V2ViR0xTaGFkZXI6OnRvTmF0aXZlKHY4 OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QoYXJnc1swXSkpIDogMDsKICAgICB1bnNpZ25lZCBw bmFtZSA9IHRvSW50MzIoYXJnc1sxXSk7CiAgICAgV2ViR0xHZXRJbmZvIGluZm8gPSBjb250ZXh0 LT5nZXRTaGFkZXJQYXJhbWV0ZXIoc2hhZGVyLCBwbmFtZSwgZWMpOwpAQCAtNDI4LDE2ICs0MjIs MTIgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpnZXRV bmlmb3JtQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3UKIAogICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAw OwogICAgIFdlYkdMUmVuZGVyaW5nQ29udGV4dCogY29udGV4dCA9IFY4V2ViR0xSZW5kZXJpbmdD b250ZXh0Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKLSAgICBpZiAoYXJncy5MZW5ndGgoKSA+ IDAgJiYgIWlzVW5kZWZpbmVkT3JOdWxsKGFyZ3NbMF0pICYmICFWOFdlYkdMUHJvZ3JhbTo6SGFz SW5zdGFuY2UoYXJnc1swXSkpIHsKLSAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKTsK LSAgICAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpOwotICAgIH0KKyAgICBpZiAo YXJncy5MZW5ndGgoKSA+IDAgJiYgIWlzVW5kZWZpbmVkT3JOdWxsKGFyZ3NbMF0pICYmICFWOFdl YkdMUHJvZ3JhbTo6SGFzSW5zdGFuY2UoYXJnc1swXSkpCisgICAgICAgIHJldHVybiBWOFByb3h5 Ojp0aHJvd1R5cGVFcnJvcigpOwogICAgIFdlYkdMUHJvZ3JhbSogcHJvZ3JhbSA9IFY4V2ViR0xQ cm9ncmFtOjpIYXNJbnN0YW5jZShhcmdzWzBdKSA/IFY4V2ViR0xQcm9ncmFtOjp0b05hdGl2ZSh2 ODo6SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0KGFyZ3NbMF0pKSA6IDA7CiAKLSAgICBpZiAoYXJn cy5MZW5ndGgoKSA+IDEgJiYgIWlzVW5kZWZpbmVkT3JOdWxsKGFyZ3NbMV0pICYmICFWOFdlYkdM VW5pZm9ybUxvY2F0aW9uOjpIYXNJbnN0YW5jZShhcmdzWzFdKSkgewotICAgICAgICBWOFByb3h5 Ojp0aHJvd1R5cGVFcnJvcigpOwotICAgICAgICByZXR1cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+ KCk7Ci0gICAgfQorICAgIGlmIChhcmdzLkxlbmd0aCgpID4gMSAmJiAhaXNVbmRlZmluZWRPck51 bGwoYXJnc1sxXSkgJiYgIVY4V2ViR0xVbmlmb3JtTG9jYXRpb246Okhhc0luc3RhbmNlKGFyZ3Nb MV0pKQorICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKICAgICBib29s IG9rID0gZmFsc2U7CiAgICAgV2ViR0xVbmlmb3JtTG9jYXRpb24qIGxvY2F0aW9uID0gdG9XZWJH TFVuaWZvcm1Mb2NhdGlvbihhcmdzWzFdLCBvayk7CiAKQEAgLTUwNCwxMCArNDk0LDggQEAgc3Rh dGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2ZXJ0ZXhBdHRyaWJBbmRVbmlmb3JtSGVscGVyZihj b25zdCB2ODo6QXJndW1lbnRzJgogICAgIGlmIChpc0Z1bmN0aW9uVG9DYWxsRm9yQXR0cmlidXRl KGZ1bmN0aW9uVG9DYWxsKSkKICAgICAgICAgaW5kZXggPSB0b0ludDMyKGFyZ3NbMF0pOwogICAg IGVsc2UgewotICAgICAgICBpZiAoYXJncy5MZW5ndGgoKSA+IDAgJiYgIWlzVW5kZWZpbmVkT3JO dWxsKGFyZ3NbMF0pICYmICFWOFdlYkdMVW5pZm9ybUxvY2F0aW9uOjpIYXNJbnN0YW5jZShhcmdz WzBdKSkgewotICAgICAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKLSAgICAgICAg ICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKLSAgICAgICAgfQorICAgICAgICBp ZiAoYXJncy5MZW5ndGgoKSA+IDAgJiYgIWlzVW5kZWZpbmVkT3JOdWxsKGFyZ3NbMF0pICYmICFW OFdlYkdMVW5pZm9ybUxvY2F0aW9uOjpIYXNJbnN0YW5jZShhcmdzWzBdKSkKKyAgICAgICAgICAg IHJldHVybiBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOwogICAgICAgICBsb2NhdGlvbiA9IHRv V2ViR0xVbmlmb3JtTG9jYXRpb24oYXJnc1swXSwgb2spOwogICAgIH0KIApAQCAtNTMzLDEwICs1 MjEsOCBAQCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHZlcnRleEF0dHJpYkFuZFVuaWZv cm1IZWxwZXJmKGNvbnN0IHY4OjpBcmd1bWVudHMmCiAgICAgICAgIHJldHVybiB2ODo6VW5kZWZp bmVkKCk7CiAgICAgfQogCi0gICAgaWYgKGFyZ3NbMV0uSXNFbXB0eSgpIHx8ICFhcmdzWzFdLT5J c0FycmF5KCkpIHsKLSAgICAgICAgVjhQcm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKLSAgICAgICAg cmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpOwotICAgIH0KKyAgICBpZiAoYXJnc1sxXS5J c0VtcHR5KCkgfHwgIWFyZ3NbMV0tPklzQXJyYXkoKSkKKyAgICAgICAgcmV0dXJuIFY4UHJveHk6 OnRocm93VHlwZUVycm9yKCk7CiAgICAgdjg6OkhhbmRsZTx2ODo6QXJyYXk+IGFycmF5ID0KICAg ICAgIHY4OjpMb2NhbDx2ODo6QXJyYXk+OjpDYXN0KGFyZ3NbMV0pOwogICAgIHVpbnQzMl90IGxl biA9IGFycmF5LT5MZW5ndGgoKTsKQEAgLTU4MCwxMCArNTY2LDggQEAgc3RhdGljIHY4OjpIYW5k bGU8djg6OlZhbHVlPiB1bmlmb3JtSGVscGVyaShjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzLAog ICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dOb3RFbm91Z2hBcmd1bWVudHNFcnJvcihhcmdz LkdldElzb2xhdGUoKSk7CiAKICAgICBXZWJHTFJlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQgPSBW OFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7Ci0gICAgaWYg KGFyZ3MuTGVuZ3RoKCkgPiAwICYmICFpc1VuZGVmaW5lZE9yTnVsbChhcmdzWzBdKSAmJiAhVjhX ZWJHTFVuaWZvcm1Mb2NhdGlvbjo6SGFzSW5zdGFuY2UoYXJnc1swXSkpIHsKLSAgICAgICAgVjhQ cm94eTo6dGhyb3dUeXBlRXJyb3IoKTsKLSAgICAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZh bHVlPigpOwotICAgIH0KKyAgICBpZiAoYXJncy5MZW5ndGgoKSA+IDAgJiYgIWlzVW5kZWZpbmVk T3JOdWxsKGFyZ3NbMF0pICYmICFWOFdlYkdMVW5pZm9ybUxvY2F0aW9uOjpIYXNJbnN0YW5jZShh cmdzWzBdKSkKKyAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCk7CiAgICAg Ym9vbCBvayA9IGZhbHNlOwogICAgIFdlYkdMVW5pZm9ybUxvY2F0aW9uKiBsb2NhdGlvbiA9IHRv V2ViR0xVbmlmb3JtTG9jYXRpb24oYXJnc1swXSwgb2spOwogCkBAIC02MDMsMTAgKzU4Nyw4IEBA IHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdW5pZm9ybUhlbHBlcmkoY29uc3Qgdjg6OkFy Z3VtZW50cyYgYXJncywKICAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKICAgICB9CiAK LSAgICBpZiAoYXJnc1sxXS5Jc0VtcHR5KCkgfHwgIWFyZ3NbMV0tPklzQXJyYXkoKSkgewotICAg ICAgICBWOFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOwotICAgICAgICByZXR1cm4gdjg6OkhhbmRs ZTx2ODo6VmFsdWU+KCk7Ci0gICAgfQorICAgIGlmIChhcmdzWzFdLklzRW1wdHkoKSB8fCAhYXJn c1sxXS0+SXNBcnJheSgpKQorICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dUeXBlRXJyb3Io KTsKICAgICB2ODo6SGFuZGxlPHY4OjpBcnJheT4gYXJyYXkgPQogICAgICAgdjg6OkxvY2FsPHY4 OjpBcnJheT46OkNhc3QoYXJnc1sxXSk7CiAgICAgdWludDMyX3QgbGVuID0gYXJyYXktPkxlbmd0 aCgpOwpAQCAtNjk1LDEwICs2NzcsOCBAQCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHVu aWZvcm1NYXRyaXhIZWxwZXIoY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncywKIAogICAgIFdlYkdM UmVuZGVyaW5nQ29udGV4dCogY29udGV4dCA9IFY4V2ViR0xSZW5kZXJpbmdDb250ZXh0Ojp0b05h dGl2ZShhcmdzLkhvbGRlcigpKTsKIAotICAgIGlmIChhcmdzLkxlbmd0aCgpID4gMCAmJiAhaXNV bmRlZmluZWRPck51bGwoYXJnc1swXSkgJiYgIVY4V2ViR0xVbmlmb3JtTG9jYXRpb246Okhhc0lu c3RhbmNlKGFyZ3NbMF0pKSB7Ci0gICAgICAgIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCk7Ci0g ICAgICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKLSAgICB9CisgICAgaWYgKGFy Z3MuTGVuZ3RoKCkgPiAwICYmICFpc1VuZGVmaW5lZE9yTnVsbChhcmdzWzBdKSAmJiAhVjhXZWJH TFVuaWZvcm1Mb2NhdGlvbjo6SGFzSW5zdGFuY2UoYXJnc1swXSkpCisgICAgICAgIHJldHVybiBW OFByb3h5Ojp0aHJvd1R5cGVFcnJvcigpOwogICAgIGJvb2wgb2sgPSBmYWxzZTsKICAgICBXZWJH TFVuaWZvcm1Mb2NhdGlvbiogbG9jYXRpb24gPSB0b1dlYkdMVW5pZm9ybUxvY2F0aW9uKGFyZ3Nb MF0sIG9rKTsKICAgICAKQEAgLTcxOCwxMCArNjk4LDggQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6 OlZhbHVlPiB1bmlmb3JtTWF0cml4SGVscGVyKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MsCiAg ICAgICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7CiAgICAgfQogCi0gICAgaWYgKGFyZ3NbMl0u SXNFbXB0eSgpIHx8ICFhcmdzWzJdLT5Jc0FycmF5KCkpIHsKLSAgICAgICAgVjhQcm94eTo6dGhy b3dUeXBlRXJyb3IoKTsKLSAgICAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpOwot ICAgIH0KKyAgICBpZiAoYXJnc1syXS5Jc0VtcHR5KCkgfHwgIWFyZ3NbMl0tPklzQXJyYXkoKSkK KyAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRocm93VHlwZUVycm9yKCk7CiAgICAgdjg6OkhhbmRs ZTx2ODo6QXJyYXk+IGFycmF5ID0KICAgICAgIHY4OjpMb2NhbDx2ODo6QXJyYXk+OjpDYXN0KGFy Z3NbMl0pOwogICAgIHVpbnQzMl90IGxlbiA9IGFycmF5LT5MZW5ndGgoKTsK