37160 2010-04-06 10:43:25 -0700 [V8] Throw exception in SerializedScriptValue on input errors 2010-04-07 07:05:32 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vitalyr webkit-unassigned oldest_to_newest 209105 0 vitalyr 2010-04-06 10:43:25 -0700 [V8] Throw exception in SerializedScriptValue on input errors 209112 1 52650 vitalyr 2010-04-06 10:48:51 -0700 Created attachment 52650 patch v1 209495 2 52650 yurys 2010-04-07 00:08:01 -0700 Comment on attachment 52650 patch v1 > - explicit SerializedScriptValue(v8::Handle<v8::Value>); > + SerializedScriptValue(v8::Handle<v8::Value>, bool& didThrow); > I don't like the idea of out parameter in the constructor but since it's private I think that is ok. 209623 3 vitalyr 2010-04-07 07:05:32 -0700 M WebCore/ChangeLog M WebCore/bindings/scripts/CodeGeneratorV8.pm M WebCore/bindings/v8/SerializedScriptValue.cpp M WebCore/bindings/v8/SerializedScriptValue.h M WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp M WebCore/bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp M WebCore/bindings/v8/custom/V8HistoryCustom.cpp M WebCore/bindings/v8/custom/V8MessagePortCustom.cpp M WebCore/bindings/v8/custom/V8PopStateEventCustom.cpp M WebCore/bindings/v8/custom/V8WorkerCustom.cpp Committed r57207 52650 2010-04-06 10:48:51 -0700 2010-04-07 00:08:01 -0700 patch v1 exceptions.patch text/plain 12716 vitalyr ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWNkMzliMS4uYTczMjQ2ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MCBAQAorMjAxMC0wNC0wNiAgVml0YWx5IFJlcGVz aGtvICA8dml0YWx5ckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW1Y4XSBUaHJvdyBleGNlcHRpb24gaW4gU2VyaWFsaXplZFNj cmlwdFZhbHVlIG9uIGlucHV0IGVycm9ycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MzcxNjAKKworICAgICAgICBXaGVuIGN5Y2xlcyBhcmUgZGV0ZWN0 ZWQgU2VyaWFsaXplZFNjcmlwdFZhbHVlIHNob3VsZCB0aHJvdworICAgICAgICBOT1RfU1VQUE9S VEVEX0VSUi4gU2VlCisgICAgICAgIGh0dHA6Ly93d3cud2hhdHdnLm9yZy9zcGVjcy93ZWItYXBw cy8yMDA5LTEwLTI3L211bHRpcGFnZS91cmxzLmh0bWwjc3RydWN0dXJlZC1jbG9uZQorCisgICAg ICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG06IEN1c3RvbSBwcm9jZXNz aW5nIGZvcgorICAgICAgICBmdW5jdGlvbiBhcmd1bWVudHMgb2YgdHlwZSBTZXJpYWxpemVkU2Ny aXB0VmFsdWUuCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlOjpTZXJpYWxpemVk U2NyaXB0VmFsdWUpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRWYWx1 ZS5oOgorICAgICAgICAoV2ViQ29yZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlOjpjcmVhdGUpOiBB ZGRlZCBhIGNvbnN0cnVjdG9yCisgICAgICAgIGZ1bmN0aW9uIHdpdGggYW4gZXh0cmEgcGFyYXRl bWVyIHRvIGNoZWNrIHdoZXRoZXIgYW4gZXhjZXB0aW9uIHdhcworICAgICAgICB0aHJvd24uCisK KyAgICAgICAgU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpjcmVhdGUgY2FsbGVycyB1cGRhdGVkIHRv IGNoZWNrIGZvcgorICAgICAgICBleGNlcHRpb25zOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1 c3RvbS9WOERPTVdpbmRvd0N1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOERPTVdpbmRv dzo6cG9zdE1lc3NhZ2VDYWxsYmFjayk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4 RGVkaWNhdGVkV29ya2VyQ29udGV4dEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOERl ZGljYXRlZFdvcmtlckNvbnRleHQ6OnBvc3RNZXNzYWdlQ2FsbGJhY2spOgorICAgICAgICAqIGJp bmRpbmdzL3Y4L2N1c3RvbS9WOEhpc3RvcnlDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 VjhIaXN0b3J5OjpwdXNoU3RhdGVDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpWOEhpc3Rv cnk6OnJlcGxhY2VTdGF0ZUNhbGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20v VjhNZXNzYWdlUG9ydEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOE1lc3NhZ2VQb3J0 Ojpwb3N0TWVzc2FnZUNhbGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhQ b3BTdGF0ZUV2ZW50Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4UG9wU3RhdGVFdmVu dDo6aW5pdFBvcFN0YXRlRXZlbnRDYWxsYmFjayk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3Vz dG9tL1Y4V29ya2VyQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4V29ya2VyOjpwb3N0 TWVzc2FnZUNhbGxiYWNrKToKKwogMjAxMC0wNC0wNiAgTWF0dGlhcyBOaXNzbGVyICA8bW5pc3Ns ZXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRp ZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtIGIv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQppbmRleCBkMWU3NzRk Li5kNzYyZjZkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVy YXRvclY4LnBtCisrKyBiL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgu cG0KQEAgLTExMDEsMTMgKzExMDEsMjIgQEAgRU5ECiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29u dGVudERlY2xzLCAiICAgIH1cbiIpOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKEJhc2ljVHlw ZUNhbkZhaWxDb252ZXJzaW9uKCRwYXJhbWV0ZXIpKSB7CisgICAgICAgIGlmICgkcGFyYW1ldGVy LT50eXBlIGVxICJTZXJpYWxpemVkU2NyaXB0VmFsdWUiKSB7CisgICAgICAgICAgICAkaW1wbElu Y2x1ZGVzeyJTZXJpYWxpemVkU2NyaXB0VmFsdWUuaCJ9ID0gMTsKKyAgICAgICAgICAgIHB1c2go QGltcGxDb250ZW50RGVjbHMsICIgICAgYm9vbCAke3BhcmFtZXRlck5hbWV9RGlkVGhyb3cgPSBm YWxzZTtcbiIpOworICAgICAgICB9IGVsc2lmIChCYXNpY1R5cGVDYW5GYWlsQ29udmVyc2lvbigk cGFyYW1ldGVyKSkgewogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICBi b29sICR7cGFyYW1ldGVyTmFtZX1PaztcbiIpOwogICAgICAgICB9CiAKICAgICAgICAgcHVzaChA aW1wbENvbnRlbnREZWNscywgIiAgICAiIC4gR2V0TmF0aXZlVHlwZUZyb21TaWduYXR1cmUoJHBh cmFtZXRlciwgJHBhcmFtSW5kZXgpIC4gIiAkcGFyYW1ldGVyTmFtZSA9ICIpOwotICAgICAgICBw dXNoKEBpbXBsQ29udGVudERlY2xzLCBKU1ZhbHVlVG9OYXRpdmUoJHBhcmFtZXRlciwgImFyZ3Nb JHBhcmFtSW5kZXhdIiwKLSAgICAgICAgICAgQmFzaWNUeXBlQ2FuRmFpbENvbnZlcnNpb24oJHBh cmFtZXRlcikgPyAgIiR7cGFyYW1ldGVyTmFtZX1PayIgOiB1bmRlZikgLiAiO1xuIik7CisKKyAg ICAgICAgaWYgKCRwYXJhbWV0ZXItPnR5cGUgZXEgIlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSIpIHsK KyAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICJTZXJpYWxpemVkU2NyaXB0VmFs dWU6OmNyZWF0ZShhcmdzWyRwYXJhbUluZGV4XSwgJHtwYXJhbWV0ZXJOYW1lfURpZFRocm93KTtc biIpOworICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICBpZiAoJHtwYXJh bWV0ZXJOYW1lfURpZFRocm93KVxuICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7XG4iKTsKKyAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsIEpTVmFs dWVUb05hdGl2ZSgkcGFyYW1ldGVyLCAiYXJnc1skcGFyYW1JbmRleF0iLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEJhc2ljVHlwZUNhbkZhaWxD b252ZXJzaW9uKCRwYXJhbWV0ZXIpID8gICIke3BhcmFtZXRlck5hbWV9T2siIDogdW5kZWYpIC4g IjtcbiIpOworICAgICAgICB9CiAKICAgICAgICAgaWYgKFR5cGVDYW5GYWlsQ29udmVyc2lvbigk cGFyYW1ldGVyKSkgewogICAgICAgICAgICAgJGltcGxJbmNsdWRlc3siRXhjZXB0aW9uQ29kZS5o In0gPSAxOwpAQCAtMjQ4NCwxMCArMjQ5Myw3IEBAIHN1YiBKU1ZhbHVlVG9OYXRpdmUKICAgICAg ICAgcmV0dXJuICR2YWx1ZTsKICAgICB9CiAKLSAgICBpZiAoJHR5cGUgZXEgIlNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZSIpIHsKLSAgICAgICAgJGltcGxJbmNsdWRlc3siU2VyaWFsaXplZFNjcmlwdFZh bHVlLmgifSA9IDE7Ci0gICAgICAgIHJldHVybiAiU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpjcmVh dGUoJHZhbHVlKSI7Ci0gICAgfQorICAgIGRpZSAiVW5leHBlY3RlZCBTZXJpYWxpemVkU2NyaXB0 VmFsdWUiIGlmICR0eXBlIGVxICJTZXJpYWxpemVkU2NyaXB0VmFsdWUiOwogCiAgICAgaWYgKCR0 eXBlIGVxICJET01PYmplY3QiKSB7CiAgICAgICAgICRpbXBsSW5jbHVkZXN7IlNjcmlwdFZhbHVl LmgifSA9IDE7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3Jp cHRWYWx1ZS5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5j cHAKaW5kZXggOGI4NmViZS4uMmFkNDU4NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92 OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2Vy aWFsaXplZFNjcmlwdFZhbHVlLmNwcApAQCAtMzYsNiArMzYsNyBAQAogI2luY2x1ZGUgIkltYWdl RGF0YS5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgogI2luY2x1ZGUgIlY4SW1hZ2VEYXRh LmgiCisjaW5jbHVkZSAiVjhQcm94eS5oIgogCiAjaW5jbHVkZSA8djguaD4KICNpbmNsdWRlIDx3 dGYvQXNzZXJ0aW9ucy5oPgpAQCAtODY5LDEyICs4NzAsMTQgQEAgcHJpdmF0ZToKIAogfSAvLyBu YW1lc3BhY2UKIAotU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpTZXJpYWxpemVkU2NyaXB0VmFsdWUo djg6OkhhbmRsZTx2ODo6VmFsdWU+IHZhbHVlKQorU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpTZXJp YWxpemVkU2NyaXB0VmFsdWUodjg6OkhhbmRsZTx2ODo6VmFsdWU+IHZhbHVlLCBib29sJiBkaWRU aHJvdykKIHsKKyAgICBkaWRUaHJvdyA9IGZhbHNlOwogICAgIFdyaXRlciB3cml0ZXI7CiAgICAg U2VyaWFsaXplciBzZXJpYWxpemVyKHdyaXRlcik7CiAgICAgaWYgKCFzZXJpYWxpemVyLnNlcmlh bGl6ZSh2YWx1ZSkpIHsKLSAgICAgICAgLy8gRklYTUU6IHRocm93IGV4Y2VwdGlvbgorICAgICAg ICB0aHJvd0Vycm9yKE5PVF9TVVBQT1JURURfRVJSKTsKKyAgICAgICAgZGlkVGhyb3cgPSB0cnVl OwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIG1fZGF0YSA9IFN0cmluZ0ltcGw6OmFkb3B0 KHdyaXRlci5kYXRhKCkpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9TZXJpYWxp emVkU2NyaXB0VmFsdWUuaCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFsaXplZFNjcmlwdFZh bHVlLmgKaW5kZXggYTdiYzNiNi4uODIwNWE0MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5n cy92OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Nl cmlhbGl6ZWRTY3JpcHRWYWx1ZS5oCkBAIC01Niw3ICs1NiwyMCBAQCBwdWJsaWM6CiAgICAgLy8g Q3JlYXRlcyBhIHNlcmlhbGl6ZWQgcmVwcmVzZW50YXRpb24gb2YgdGhlIGdpdmVuIFY4IHZhbHVl LgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gY3JlYXRlKHY4 OjpIYW5kbGU8djg6OlZhbHVlPiB2YWx1ZSkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJl ZihuZXcgU2VyaWFsaXplZFNjcmlwdFZhbHVlKHZhbHVlKSk7CisgICAgICAgIGJvb2wgZGlkVGhy b3c7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgU2VyaWFsaXplZFNjcmlwdFZhbHVlKHZh bHVlLCBkaWRUaHJvdykpOworICAgIH0KKworICAgIC8vIENyZWF0ZXMgYSBzZXJpYWxpemVkIHJl cHJlc2VudGF0aW9uIG9mIHRoZSBnaXZlbiBWOCB2YWx1ZS4KKyAgICAvLworICAgIC8vIElmIGEg c2VyaWFsaXphdGlvbiBlcnJvciBvY2N1cnMgKGUuZy4sIGN5Y2xpYyBpbnB1dCB2YWx1ZSkgdGhp cworICAgIC8vIGZ1bmN0aW9uIHJldHVybnMgYW4gZW1wdHkgcmVwcmVzZW50YXRpb24sIHNjaGVk dWxlcyBhIFY4IGV4Y2VwdGlvbiB0bworICAgIC8vIGJlIHRocm93biB1c2luZyB2ODo6VGhyb3dF eGNlcHRpb24oKSwgYW5kIHNldHMgfGRpZFRocm93fC4gSW4gdGhpcyBjYXNlCisgICAgLy8gdGhl IGNhbGxlciBtdXN0IG5vdCBpbnZva2UgYW55IFY4IG9wZXJhdGlvbnMgdW50aWwgY29udHJvbCBy ZXR1cm5zIHRvCisgICAgLy8gVjguIFdoZW4gc2VyaWFsaXphdGlvbiBpcyBzdWNjZXNzZnVsLCB8 ZGlkVGhyb3d8IGlzIGZhbHNlLgorICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3Jp cHRWYWx1ZT4gY3JlYXRlKHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2YWx1ZSwgYm9vbCYgZGlkVGhy b3cpCisgICAgeworICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFNlcmlhbGl6ZWRTY3JpcHRW YWx1ZSh2YWx1ZSwgZGlkVGhyb3cpKTsKICAgICB9CiAKICAgICAvLyBDcmVhdGVzIGEgc2VyaWFs aXplZCB2YWx1ZSB3aXRoIHRoZSBnaXZlbiBkYXRhIG9idGFpbmVkIGZyb20gYQpAQCAtOTksNyAr MTEyLDcgQEAgcHJpdmF0ZToKIAogICAgIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSgpIHsgfQogCi0g ICAgZXhwbGljaXQgU2VyaWFsaXplZFNjcmlwdFZhbHVlKHY4OjpIYW5kbGU8djg6OlZhbHVlPik7 CisgICAgU2VyaWFsaXplZFNjcmlwdFZhbHVlKHY4OjpIYW5kbGU8djg6OlZhbHVlPiwgYm9vbCYg ZGlkVGhyb3cpOwogCiAgICAgU2VyaWFsaXplZFNjcmlwdFZhbHVlKFN0cmluZyBkYXRhLCBTdHJp bmdEYXRhTW9kZSBtb2RlKTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhET01XaW5kb3dDdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhE T01XaW5kb3dDdXN0b20uY3BwCmluZGV4IDYyMTVkMzguLjIyZTE1OGIgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcAorKysgYi9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVdpbmRvd0N1c3RvbS5jcHAKQEAgLTMyMCw4ICsz MjAsMTEgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4RE9NV2luZG93Ojpwb3N0TWVzc2FnZUNh bGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MKICAgICBET01XaW5kb3cqIHNvdXJjZSA9 IFY4UHJveHk6OnJldHJpZXZlRnJhbWVGb3JDYWxsaW5nQ29udGV4dCgpLT5kb21XaW5kb3coKTsK ICAgICBBU1NFUlQoc291cmNlLT5mcmFtZSgpKTsKIAotICAgIHY4OjpUcnlDYXRjaCB0cnlDYXRj aDsKLSAgICBSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBtZXNzYWdlID0gU2VyaWFsaXpl ZFNjcmlwdFZhbHVlOjpjcmVhdGUoYXJnc1swXSk7CisgICAgYm9vbCBkaWRUaHJvdyA9IGZhbHNl OworICAgIFJlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IG1lc3NhZ2UgPSBTZXJpYWxpemVk U2NyaXB0VmFsdWU6OmNyZWF0ZShhcmdzWzBdLCBkaWRUaHJvdyk7CisgICAgaWYgKGRpZFRocm93 KQorICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOworCiAgICAgTWVzc2FnZVBvcnRBcnJh eSBwb3J0QXJyYXk7CiAgICAgU3RyaW5nIHRhcmdldE9yaWdpbjsKIApAQCAtMzI5LDYgKzMzMiw3 IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOERPTVdpbmRvdzo6cG9zdE1lc3NhZ2VDYWxsYmFj ayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzCiAgICAgLy8gICBwb3N0TWVzc2FnZShtZXNzYWdl LCBwb3J0LCB0YXJnZXRPcmlnaW4pOwogICAgIC8vIG9yCiAgICAgLy8gICBwb3N0TWVzc2FnZSht ZXNzYWdlLCB0YXJnZXRPcmlnaW4pOworICAgIHY4OjpUcnlDYXRjaCB0cnlDYXRjaDsKICAgICBp ZiAoYXJncy5MZW5ndGgoKSA+IDIpIHsKICAgICAgICAgaWYgKCFnZXRNZXNzYWdlUG9ydEFycmF5 KGFyZ3NbMV0sIHBvcnRBcnJheSkpCiAgICAgICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgp OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhEZWRpY2F0ZWRXb3Jr ZXJDb250ZXh0Q3VzdG9tLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGVkaWNh dGVkV29ya2VyQ29udGV4dEN1c3RvbS5jcHAKaW5kZXggNDQ4NmRiZS4uOGZjZjlhOCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhEZWRpY2F0ZWRXb3JrZXJDb250ZXh0 Q3VzdG9tLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERlZGljYXRlZFdv cmtlckNvbnRleHRDdXN0b20uY3BwCkBAIC00Niw3ICs0NiwxMCBAQCB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gVjhEZWRpY2F0ZWRXb3JrZXJDb250ZXh0Ojpwb3N0TWVzc2FnZUNhbGxiYWNrKGNvbnN0 IHY4OjpBcgogewogICAgIElOQ19TVEFUUyhMIkRPTS5EZWRpY2F0ZWRXb3JrZXJDb250ZXh0LnBv c3RNZXNzYWdlIik7CiAgICAgRGVkaWNhdGVkV29ya2VyQ29udGV4dCogd29ya2VyQ29udGV4dCA9 IFY4RGVkaWNhdGVkV29ya2VyQ29udGV4dDo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7Ci0gICAg UmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gbWVzc2FnZSA9IFNlcmlhbGl6ZWRTY3JpcHRW YWx1ZTo6Y3JlYXRlKGFyZ3NbMF0pOworICAgIGJvb2wgZGlkVGhyb3cgPSBmYWxzZTsKKyAgICBS ZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBtZXNzYWdlID0gU2VyaWFsaXplZFNjcmlwdFZh bHVlOjpjcmVhdGUoYXJnc1swXSwgZGlkVGhyb3cpOworICAgIGlmIChkaWRUaHJvdykKKyAgICAg ICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKICAgICBNZXNzYWdlUG9ydEFycmF5IHBvcnRBcnJh eTsKICAgICBpZiAoYXJncy5MZW5ndGgoKSA+IDEpIHsKICAgICAgICAgaWYgKCFnZXRNZXNzYWdl UG9ydEFycmF5KGFyZ3NbMV0sIHBvcnRBcnJheSkpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRp bmdzL3Y4L2N1c3RvbS9WOEhpc3RvcnlDdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9j dXN0b20vVjhIaXN0b3J5Q3VzdG9tLmNwcAppbmRleCBlZGZjMmQ2Li5hZDJiOWE5IDEwMDY0NAot LS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhpc3RvcnlDdXN0b20uY3BwCisrKyBi L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SGlzdG9yeUN1c3RvbS5jcHAKQEAgLTQzLDcg KzQzLDEwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4 SGlzdG9yeTo6cHVzaFN0YXRlQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKIHsK LSAgICBSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBoaXN0b3J5U3RhdGUgPSBTZXJpYWxp emVkU2NyaXB0VmFsdWU6OmNyZWF0ZShhcmdzWzBdKTsKKyAgICBib29sIGRpZFRocm93ID0gZmFs c2U7CisgICAgUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gaGlzdG9yeVN0YXRlID0gU2Vy aWFsaXplZFNjcmlwdFZhbHVlOjpjcmVhdGUoYXJnc1swXSwgZGlkVGhyb3cpOworICAgIGlmIChk aWRUaHJvdykKKyAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKIAogICAgIHY4OjpUcnlD YXRjaCB0cnlDYXRjaDsKICAgICBTdHJpbmcgdGl0bGUgPSB0b1dlYkNvcmVTdHJpbmdXaXRoTnVs bE9yVW5kZWZpbmVkQ2hlY2soYXJnc1sxXSk7CkBAIC02NCw3ICs2NywxMCBAQCB2ODo6SGFuZGxl PHY4OjpWYWx1ZT4gVjhIaXN0b3J5OjpwdXNoU3RhdGVDYWxsYmFjayhjb25zdCB2ODo6QXJndW1l bnRzJiBhcmdzKQogCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhIaXN0b3J5OjpyZXBsYWNlU3Rh dGVDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQogewotICAgIFJlZlB0cjxTZXJp YWxpemVkU2NyaXB0VmFsdWU+IGhpc3RvcnlTdGF0ZSA9IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6 Y3JlYXRlKGFyZ3NbMF0pOworICAgIGJvb2wgZGlkVGhyb3cgPSBmYWxzZTsKKyAgICBSZWZQdHI8 U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBoaXN0b3J5U3RhdGUgPSBTZXJpYWxpemVkU2NyaXB0VmFs dWU6OmNyZWF0ZShhcmdzWzBdLCBkaWRUaHJvdyk7CisgICAgaWYgKGRpZFRocm93KQorICAgICAg ICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwogCiAgICAgdjg6OlRyeUNhdGNoIHRyeUNhdGNoOwog ICAgIFN0cmluZyB0aXRsZSA9IHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsT3JVbmRlZmluZWRDaGVj ayhhcmdzWzFdKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4TWVz c2FnZVBvcnRDdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdl UG9ydEN1c3RvbS5jcHAKaW5kZXggNjQwMDQxYi4uYzQxZWQzOCAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdlUG9ydEN1c3RvbS5jcHAKKysrIGIvV2ViQ29y ZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdlUG9ydEN1c3RvbS5jcHAKQEAgLTQ2LDcgKzQ2 LDEwIEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOE1lc3NhZ2VQb3J0Ojpwb3N0TWVzc2FnZUNh bGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyCiB7CiAgICAgSU5DX1NUQVRTKCJET00uTWVz c2FnZVBvcnQucG9zdE1lc3NhZ2UiKTsKICAgICBNZXNzYWdlUG9ydCogbWVzc2FnZVBvcnQgPSBW OE1lc3NhZ2VQb3J0Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKLSAgICBSZWZQdHI8U2VyaWFs aXplZFNjcmlwdFZhbHVlPiBtZXNzYWdlID0gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpjcmVhdGUo YXJnc1swXSk7CisgICAgYm9vbCBkaWRUaHJvdyA9IGZhbHNlOworICAgIFJlZlB0cjxTZXJpYWxp emVkU2NyaXB0VmFsdWU+IG1lc3NhZ2UgPSBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNyZWF0ZShh cmdzWzBdLCBkaWRUaHJvdyk7CisgICAgaWYgKGRpZFRocm93KQorICAgICAgICByZXR1cm4gdjg6 OlVuZGVmaW5lZCgpOwogICAgIE1lc3NhZ2VQb3J0QXJyYXkgcG9ydEFycmF5OwogICAgIGlmIChh cmdzLkxlbmd0aCgpID4gMSkgewogICAgICAgICBpZiAoIWdldE1lc3NhZ2VQb3J0QXJyYXkoYXJn c1sxXSwgcG9ydEFycmF5KSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4UG9wU3RhdGVFdmVudEN1c3RvbS5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9W OFBvcFN0YXRlRXZlbnRDdXN0b20uY3BwCmluZGV4IDQ2ZTk5MjkuLmNkYjE2MGQgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4UG9wU3RhdGVFdmVudEN1c3RvbS5jcHAK KysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhQb3BTdGF0ZUV2ZW50Q3VzdG9tLmNw cApAQCAtMzUsNiArMzUsOCBAQAogI2luY2x1ZGUgIlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oIgog I2luY2x1ZGUgIlY4UHJveHkuaCIKIAorI2luY2x1ZGUgPHY4Lmg+CisKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4UG9wU3RhdGVFdmVudDo6aW5pdFBvcFN0 YXRlRXZlbnRDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQpAQCAtNDQsNyArNDYs MTEgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4UG9wU3RhdGVFdmVudDo6aW5pdFBvcFN0YXRl RXZlbnRDYWxsYmFjayhjb25zdCB2ODo6QXJndW0KICAgICBTdHJpbmcgdHlwZUFyZyA9IHY4VmFs dWVUb1dlYkNvcmVTdHJpbmcoYXJnc1swXSk7CiAgICAgYm9vbCBjYW5CdWJibGVBcmcgPSBhcmdz WzFdLT5Cb29sZWFuVmFsdWUoKTsKICAgICBib29sIGNhbmNlbGFibGVBcmcgPSBhcmdzWzJdLT5C b29sZWFuVmFsdWUoKTsKLSAgICBSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBzdGF0ZUFy ZyA9IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6Y3JlYXRlKGFyZ3NbM10pOworCisgICAgYm9vbCBk aWRUaHJvdyA9IGZhbHNlOworICAgIFJlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IHN0YXRl QXJnID0gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpjcmVhdGUoYXJnc1szXSwgZGlkVGhyb3cpOwor ICAgIGlmIChkaWRUaHJvdykKKyAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKIAogICAg IFBvcFN0YXRlRXZlbnQqIGV2ZW50ID0gVjhQb3BTdGF0ZUV2ZW50Ojp0b05hdGl2ZShhcmdzLkhv bGRlcigpKTsKICAgICBldmVudC0+aW5pdFBvcFN0YXRlRXZlbnQodHlwZUFyZywgY2FuQnViYmxl QXJnLCBjYW5jZWxhYmxlQXJnLCBzdGF0ZUFyZy5yZWxlYXNlKCkpOwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhXb3JrZXJDdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5k aW5ncy92OC9jdXN0b20vVjhXb3JrZXJDdXN0b20uY3BwCmluZGV4IGRjZjczYzIuLmZkYzY4MTUg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4V29ya2VyQ3VzdG9tLmNw cAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFdvcmtlckN1c3RvbS5jcHAKQEAg LTkxLDcgKzkxLDEwIEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFdvcmtlcjo6cG9zdE1lc3Nh Z2VDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQogewogICAgIElOQ19TVEFUUygi RE9NLldvcmtlci5wb3N0TWVzc2FnZSIpOwogICAgIFdvcmtlciogd29ya2VyID0gVjhXb3JrZXI6 OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOwotICAgIFJlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFs dWU+IG1lc3NhZ2UgPSBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNyZWF0ZShhcmdzWzBdKTsKKyAg ICBib29sIGRpZFRocm93ID0gZmFsc2U7CisgICAgUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1 ZT4gbWVzc2FnZSA9IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6Y3JlYXRlKGFyZ3NbMF0sIGRpZFRo cm93KTsKKyAgICBpZiAoZGlkVGhyb3cpCisgICAgICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7 CiAgICAgTWVzc2FnZVBvcnRBcnJheSBwb3J0QXJyYXk7CiAgICAgaWYgKGFyZ3MuTGVuZ3RoKCkg PiAxKSB7CiAgICAgICAgIGlmICghZ2V0TWVzc2FnZVBvcnRBcnJheShhcmdzWzFdLCBwb3J0QXJy YXkpKQo=