15979 2007-11-13 22:48:40 -0800 Console logs in a database callback lose line number information 2010-04-05 09:09:02 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All OS X 10.4 RESOLVED FIXED P2 Normal --- 1 beidson oliver ap aroben oliver oldest_to_newest 61179 0 beidson 2007-11-13 22:48:40 -0800 See http://bugs.webkit.org/show_bug.cgi?id=15976 and the layout test in LayoutTests/storage/transaction_callback_exception_crash.html When an exception is thrown from within a callback, there is no line number information in the console log. Why not? 86445 1 oliver 2008-07-20 01:39:53 -0700 Okay, I have looked at this. You don't get line/source information as you are throwing a primitive value which we cannot attach useful information to -- if you were to throw an object, everything should just work. If that is the case then this is a duplicate of bug #18855 86452 2 oliver 2008-07-20 03:49:31 -0700 I am now actually working on this. There was a wide spread of incorrect exception handling (in the sense that value conversion was bogus, and line numbers being lost). 86454 3 22387 oliver 2008-07-20 04:37:04 -0700 Created attachment 22387 Fix exception handling in the many places it wasn't correct. 86456 4 ap 2008-07-20 05:42:03 -0700 See also: bug 17470, bug 18232, bug 18234. 86457 5 22387 oliver 2008-07-20 05:44:15 -0700 Comment on attachment 22387 Fix exception handling in the many places it wasn't correct. Mark reviewed, and requested a few changes. Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/fast/dom/NamedNodeMap-setNamedItem-crash-expected.txt A LayoutTests/fast/js/exceptions-thrown-in-callbacks-expected.txt A LayoutTests/fast/js/exceptions-thrown-in-callbacks.html M LayoutTests/fast/xpath/nsresolver-exception-expected.txt M LayoutTests/fast/xsl/transform-xhr-doc-expected.txt M LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt M LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt M LayoutTests/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt M LayoutTests/platform/mac/fast/dynamic/015-expected.txt M LayoutTests/platform/mac/fast/events/updateLayoutForHitTest-expected.txt M LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug92868_1-expected.txt M LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendCells1-expected.txt M LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendCellsRebuild1-expected.txt M LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/insertTbodyExpand1-expected.txt M LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/insertTbodyRebuild1-expected.txt M LayoutTests/storage/transaction_callback_exception_crash-expected.txt M WebCore/ChangeLog M WebCore/bindings/js/JSCustomSQLStatementCallback.cpp M WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp M WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp M WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp M WebCore/bindings/js/JSCustomVoidCallback.cpp M WebCore/bindings/js/JSCustomXPathNSResolver.cpp M WebCore/bindings/js/JSEventListener.cpp M WebCore/bindings/js/ScheduledAction.cpp M WebCore/bindings/js/ScriptController.cpp M WebCore/bindings/objc/WebScriptObject.mm M WebCore/page/Console.cpp M WebCore/page/Console.h Committed r35253 22387 2008-07-20 04:37:04 -0700 2008-07-20 05:44:15 -0700 Fix exception handling in the many places it wasn't correct. exception-in-callbacks.patch text/plain 17673 oliver ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3NzFmNzg3Li5jNWU3ODAxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDgtMDct MjAgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMYXlvdXQgdGVzdCB0byBjaGVjayBjb3JyZWN0 bHkgaGFuZGxpbmcgb2YgZXhjZXB0aW9ucyBieSBXZWJDb3JlCisKKyAgICAgICAgKiBmYXN0L2pz L2V4Y2VwdGlvbnMtdGhyb3duLWluLWNhbGxiYWNrcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIGZhc3QvanMvZXhjZXB0aW9ucy10aHJvd24taW4tY2FsbGJhY2tzLmh0bWw6IEFkZGVk LgorCiAyMDA4LTA3LTE5ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQ2FtZXJvbiBad2FyaWNoLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9qcy9leGNlcHRpb25zLXRocm93bi1pbi1jYWxsYmFja3MtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvZmFzdC9qcy9leGNlcHRpb25zLXRocm93bi1pbi1jYWxsYmFja3MtZXhwZWN0ZWQu dHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE1Y2QwMGEKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2pzL2V4Y2VwdGlvbnMtdGhyb3duLWluLWNhbGxi YWNrcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBACitDT05TT0xFIE1FU1NBR0U6IGxpbmUg MTc6IFBBU1M6IHRvU3RyaW5nIGNhbGxlZCBvbiBleGNlcHRpb24gdmFsdWUgdGhyb3duIGZyb20g ZXZlbnQgaGFuZGxlcgorQ09OU09MRSBNRVNTQUdFOiBsaW5lIDIzOiBQQVNTOiB0b1N0cmluZyBj YWxsZWQgb24gZXhjZXB0aW9uIHZhbHVlIHRocm93biBmcm9tIHNxbCB0cmFuc2FjdGlvbiBjYWxs YmFjaworQ09OU09MRSBNRVNTQUdFOiBsaW5lIDMzOiBQQVNTOiB0b1N0cmluZyBjYWxsZWQgb24g ZXhjZXB0aW9uIHZhbHVlIHRocm93biBmcm9tIHNxbCBlcnJvciBjYWxsYmFjaworQ09OU09MRSBN RVNTQUdFOiBsaW5lIDQxOiBQQVNTOiB0b1N0cmluZyBjYWxsZWQgb24gZXhjZXB0aW9uIHZhbHVl IHRocm93biBmcm9tIHRpbWVyCitUaGlzIHRlc3QgZW5zdXJlcyB0aGF0IGV4Y2VwdGlvbnMgYXJl IGhhbmRsZWQgY29ycmVjdGx5IGJ5IHRoZSB2YXJpb3VzIGNhbGxiYWNrIG1lY2hhbmlzbXMgcHJl c2VudCBpbiBXZWJDb3JlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9leGNlcHRp b25zLXRocm93bi1pbi1jYWxsYmFja3MuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvanMvZXhjZXB0 aW9ucy10aHJvd24taW4tY2FsbGJhY2tzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMC4uMjIxZmUwMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvanMv ZXhjZXB0aW9ucy10aHJvd24taW4tY2FsbGJhY2tzLmh0bWwKQEAgLTAsMCArMSw0NiBAQAorVGhp cyB0ZXN0IGVuc3VyZXMgdGhhdCBleGNlcHRpb25zIGFyZSBoYW5kbGVkIGNvcnJlY3RseSBieSB0 aGUgdmFyaW91cyBjYWxsYmFjayBtZWNoYW5pc21zIHByZXNlbnQgaW4gV2ViQ29yZS4KKzxzY3Jp cHQ+CitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgbGF5b3V0VGVzdENv bnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRp bERvbmUoKTsKK30KKwordmFyIGRiID0gb3BlbkRhdGFiYXNlKCJleGNlcHRpb24taW5mby10ZXN0 IiwgIjEuMCIsICJUZXN0IGZvciBleGNlcHRpb24gaW5mb3JtYXRpb24gdGhyb3duIGJ5IGNhbGxi YWNrcyBhbmQgdGltZXJzIiwgMSk7CisKK2Z1bmN0aW9uIGVycm9yT2JqZWN0KG1zZykgeworICAg IHJldHVybiB7IG1lc3NhZ2U6ICJGQUlMOiBtZXNzYWdlIGluY29ycmVjdGx5IHB1bGxlZCBmcm9t IHRocm93biBvYmplY3QgaW4gIiArIG1zZywgCisgICAgICAgICAgICAgdG9TdHJpbmc6IGZ1bmN0 aW9uKCkge3JldHVybiAiUEFTUzogdG9TdHJpbmcgY2FsbGVkIG9uIGV4Y2VwdGlvbiB2YWx1ZSB0 aHJvd24gZnJvbSAiICsgbXNnfSB9Cit9CisKK2Z1bmN0aW9uIGV2ZW50VGVzdCgpIHsKKyAgICBz ZXRUaW1lb3V0KGRiVHJhbnNhY3Rpb25UZXN0LCAwKTsKKyAgICB0aHJvdyBlcnJvck9iamVjdCgi ZXZlbnQgaGFuZGxlciIpOworfQorCitmdW5jdGlvbiBkYlRyYW5zYWN0aW9uVGVzdCgpIHsKKyAg ICBkYi50cmFuc2FjdGlvbihmdW5jdGlvbih0eCkgeyAKKyAgICAgICAgc2V0VGltZW91dChkYlN0 YXRlbWVudFRlc3QsIDApOworICAgICAgICB0aHJvdyBlcnJvck9iamVjdCgic3FsIHRyYW5zYWN0 aW9uIGNhbGxiYWNrIik7CisgICAgfSk7Cit9CisKK2Z1bmN0aW9uIGRiU3RhdGVtZW50VGVzdCgp IHsKKyAgICBkYi50cmFuc2FjdGlvbigKKyAgICAgICAgZnVuY3Rpb24odHgpIHsKKyAgICAgICAg ICAgIHR4LmV4ZWN1dGVTcWwoIkkgYW0gYm9ndXMgc3ludGF4IiwgW10sIGZ1bmN0aW9uKCkgewor ICAgICAgICB9LCBmdW5jdGlvbih0eCwgZXJyb3IpIHsKKyAgICAgICAgICAgIHNldFRpbWVvdXQo dGltZXJUZXN0LCAwKTsKKyAgICAgICAgICAgIHRocm93IGVycm9yT2JqZWN0KCJzcWwgZXJyb3Ig Y2FsbGJhY2siKTsKKyAgICAgICAgfSk7CisgICAgfSk7Cit9CisKK2Z1bmN0aW9uIHRpbWVyVGVz dCgpIHsKKyAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICBzZXRU aW1lb3V0KCJsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCkiLCAwKTsKKyAgICB0aHJv dyBlcnJvck9iamVjdCgidGltZXIiKTsKK30KKword2luZG93Lm9ubG9hZCA9IGV2ZW50VGVzdDsK Kzwvc2NyaXB0PgorCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDI2NDFhMTMuLjJlMjA5NWEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsNDQgQEAKIAogICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBCdWcgMTU5Nzk6IENvbnNvbGUg bG9ncyBpbiBhIGRhdGFiYXNlIGNhbGxiYWNrIGxvc2UgbGluZSBudW1iZXIgaW5mb3JtYXRpb24K KyAgICAgICAgPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk3OT4K KworICAgICAgICBUaGUgcHJvYmxlbSB3YXMgdGhhdCB0aGVyZSB3ZXJlIG11bHRpcGxlIHZlcnNp b25zIG9mIHRoZSBsb2dpYyB0bworICAgICAgICBsb2cgYW4gZXhjZXB0aW9uIHRvIHRoZSBjb25z b2xlLCBtYW55IG9mIHdoaWNoIHdlcmUgaW5jb3JyZWN0LiAgV2UKKyAgICAgICAgcmVzb2x2ZSB0 aGlzIGJ5IG1ha2luZyBvbmUgc2luZ2xlIHNoYXJlZCByZXBvcnRFeGNlcHRpb24gbWV0aG9kLAor ICAgICAgICB3aGljaCBoYW5kbGVzIHRoZSBleGNlcHRpb25zIGNvcnJlY3RseS4KKworICAgICAg ICBUZXN0OiBmYXN0L2pzL2V4Y2VwdGlvbnMtdGhyb3duLWluLWNhbGxiYWNrcy5odG1sCisKKyAg ICAgICAgKiBiaW5kaW5ncy9qcy9KU0N1c3RvbVNRTFN0YXRlbWVudENhbGxiYWNrLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkpTQ3VzdG9tU1FMU3RhdGVtZW50Q2FsbGJhY2s6OmhhbmRsZUV2ZW50 KToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0N1c3RvbVNRTFN0YXRlbWVudEVycm9yQ2FsbGJh Y2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNDdXN0b21TUUxTdGF0ZW1lbnRFcnJvckNhbGxi YWNrOjpoYW5kbGVFdmVudCk6CisgICAgICAgICogYmluZGluZ3MvanMvSlNDdXN0b21TUUxUcmFu c2FjdGlvbkNhbGxiYWNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTQ3VzdG9tU1FMVHJhbnNh Y3Rpb25DYWxsYmFjazo6aGFuZGxlRXZlbnQpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTQ3Vz dG9tU1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpT Q3VzdG9tU1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrOjpoYW5kbGVFdmVudCk6CisgICAgICAg ICogYmluZGluZ3MvanMvSlNDdXN0b21Wb2lkQ2FsbGJhY2suY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SlNDdXN0b21Wb2lkQ2FsbGJhY2s6OmhhbmRsZUV2ZW50KToKKyAgICAgICAgKiBiaW5kaW5n cy9qcy9KU0N1c3RvbVhQYXRoTlNSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0N1 c3RvbVhQYXRoTlNSZXNvbHZlcjo6bG9va3VwTmFtZXNwYWNlVVJJKToKKyAgICAgICAgKiBiaW5k aW5ncy9qcy9KU0V2ZW50TGlzdGVuZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNBYnN0cmFj dEV2ZW50TGlzdGVuZXI6OmhhbmRsZUV2ZW50KToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9TY2hl ZHVsZWRBY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NoZWR1bGVkQWN0aW9uOjpleGVj dXRlKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNjcmlwdENvbnRyb2xsZXI6OmV2YWx1YXRlKToKKyAgICAgICAgKiBiaW5k aW5ncy9vYmpjL1dlYlNjcmlwdE9iamVjdC5tbToKKyAgICAgICAgKFdlYkNvcmU6OmFkZEV4Y2Vw dGlvblRvQ29uc29sZSk6CisgICAgICAgICogcGFnZS9Db25zb2xlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNvbnNvbGU6OnJlcG9ydEV4Y2VwdGlvbik6CisgICAgICAgICogcGFnZS9Db25zb2xl Lmg6CisKKzIwMDgtMDctMjAgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBCdWcgMTk3NTc6IENy YXNoIHdoZW4gYW4gb25kcmFnc3RhcnQgaGFuZGxlciBoaWRlcyB0aGUgZWxlbWVudAogICAgICAg ICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzU3PgogCmRpZmYg LS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3VzdG9tU1FMU3RhdGVtZW50Q2FsbGJhY2su Y3BwIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0N1c3RvbVNRTFN0YXRlbWVudENhbGxiYWNrLmNw cAppbmRleCBjY2VjYTI5Li5hYTM2N2UxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTQ3VzdG9tU1FMU3RhdGVtZW50Q2FsbGJhY2suY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNDdXN0b21TUUxTdGF0ZW1lbnRDYWxsYmFjay5jcHAKQEAgLTg0LDExICs4NCw5IEBAIHZv aWQgSlNDdXN0b21TUUxTdGF0ZW1lbnRDYWxsYmFjazo6aGFuZGxlRXZlbnQoU1FMVHJhbnNhY3Rp b24qIHRyYW5zYWN0aW9uLCBTUUxSCiAgICAgZ2xvYmFsT2JqZWN0LT5zdG9wVGltZW91dENoZWNr KCk7CiAgICAgICAgIAogICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkgewotICAgICAgICBK U09iamVjdCogZXhjZXB0aW9uID0gZXhlYy0+ZXhjZXB0aW9uKCktPnRvT2JqZWN0KGV4ZWMpOwot ICAgICAgICBTdHJpbmcgbWVzc2FnZSA9IGV4Y2VwdGlvbi0+Z2V0KGV4ZWMsIGV4ZWMtPnByb3Bl cnR5TmFtZXMoKS5tZXNzYWdlKS0+dG9TdHJpbmcoZXhlYyk7Ci0gICAgICAgIGludCBsaW5lTnVt YmVyID0gZXhjZXB0aW9uLT5nZXQoZXhlYywgSWRlbnRpZmllcihleGVjLCAibGluZSIpKS0+dG9J bnQzMihleGVjKTsKLSAgICAgICAgU3RyaW5nIHNvdXJjZVVSTCA9IGV4Y2VwdGlvbi0+Z2V0KGV4 ZWMsIElkZW50aWZpZXIoZXhlYywgInNvdXJjZVVSTCIpKS0+dG9TdHJpbmcoZXhlYyk7Ci0gICAg ICAgIG1fZnJhbWUtPmRvbVdpbmRvdygpLT5jb25zb2xlKCktPmFkZE1lc3NhZ2UoSlNNZXNzYWdl U291cmNlLCBFcnJvck1lc3NhZ2VMZXZlbCwgbWVzc2FnZSwgbGluZU51bWJlciwgc291cmNlVVJM KTsKKyAgICAgICAgSlNWYWx1ZSogZXhjZXB0aW9uID0gZXhlYy0+ZXhjZXB0aW9uKCk7CisgICAg ICAgIGV4ZWMtPmNsZWFyRXhjZXB0aW9uKCk7CisgICAgICAgIG1fZnJhbWUtPmRvbVdpbmRvdygp LT5jb25zb2xlKCktPnJlcG9ydEV4Y2VwdGlvbihleGVjLCBleGNlcHRpb24pOwogICAgICAgICAK ICAgICAgICAgcmFpc2VkRXhjZXB0aW9uID0gdHJ1ZTsKICAgICAgICAgCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3VzdG9tU1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjay5jcHAg Yi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3VzdG9tU1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjay5j cHAKaW5kZXggZmZhN2MyOS4uNmUyOTdiOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0N1c3RvbVNRTFN0YXRlbWVudEVycm9yQ2FsbGJhY2suY3BwCisrKyBiL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNDdXN0b21TUUxTdGF0ZW1lbnRFcnJvckNhbGxiYWNrLmNwcApAQCAtOTAsMTIg KzkwLDkgQEAgYm9vbCBKU0N1c3RvbVNRTFN0YXRlbWVudEVycm9yQ2FsbGJhY2s6OmhhbmRsZUV2 ZW50KFNRTFRyYW5zYWN0aW9uKiB0cmFuc2FjdGlvbiwKICAgICBnbG9iYWxPYmplY3QtPnN0b3BU aW1lb3V0Q2hlY2soKTsKICAgICAgICAgCiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKSB7 Ci0gICAgICAgIEpTT2JqZWN0KiBleGNlcHRpb24gPSBleGVjLT5leGNlcHRpb24oKS0+dG9PYmpl Y3QoZXhlYyk7Ci0gICAgICAgIFN0cmluZyBtZXNzYWdlID0gZXhjZXB0aW9uLT5nZXQoZXhlYywg ZXhlYy0+cHJvcGVydHlOYW1lcygpLm1lc3NhZ2UpLT50b1N0cmluZyhleGVjKTsKLSAgICAgICAg aW50IGxpbmVOdW1iZXIgPSBleGNlcHRpb24tPmdldChleGVjLCBJZGVudGlmaWVyKGV4ZWMsICJs aW5lIikpLT50b0ludDMyKGV4ZWMpOwotICAgICAgICBTdHJpbmcgc291cmNlVVJMID0gZXhjZXB0 aW9uLT5nZXQoZXhlYywgSWRlbnRpZmllcihleGVjLCAic291cmNlVVJMIikpLT50b1N0cmluZyhl eGVjKTsKLSAgICAgICAgbV9mcmFtZS0+ZG9tV2luZG93KCktPmNvbnNvbGUoKS0+YWRkTWVzc2Fn ZShKU01lc3NhZ2VTb3VyY2UsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdlLCBsaW5lTnVtYmVy LCBzb3VyY2VVUkwpOworICAgICAgICBKU1ZhbHVlKiBleGNlcHRpb24gPSBleGVjLT5leGNlcHRp b24oKTsKICAgICAgICAgZXhlYy0+Y2xlYXJFeGNlcHRpb24oKTsKKyAgICAgICAgbV9mcmFtZS0+ ZG9tV2luZG93KCktPmNvbnNvbGUoKS0+cmVwb3J0RXhjZXB0aW9uKGV4ZWMsIGV4Y2VwdGlvbik7 CiAgICAgICAgICAgICAKICAgICAgICAgLy8gVGhlIHNwZWMgc2F5czoKICAgICAgICAgLy8gIklm IHRoZSBlcnJvciBjYWxsYmFjayByZXR1cm5zIGZhbHNlLCB0aGVuIG1vdmUgb24gdG8gdGhlIG5l eHQgc3RhdGVtZW50Li4uIgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0N1c3Rv bVNRTFRyYW5zYWN0aW9uQ2FsbGJhY2suY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0N1c3Rv bVNRTFRyYW5zYWN0aW9uQ2FsbGJhY2suY3BwCmluZGV4IDFkOGFjZmYuLmMzZTRmNWYgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDdXN0b21TUUxUcmFuc2FjdGlvbkNhbGxiYWNr LmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3VzdG9tU1FMVHJhbnNhY3Rpb25DYWxs YmFjay5jcHAKQEAgLTEyOSwxMiArMTI5LDkgQEAgdm9pZCBKU0N1c3RvbVNRTFRyYW5zYWN0aW9u Q2FsbGJhY2s6OmhhbmRsZUV2ZW50KFNRTFRyYW5zYWN0aW9uKiB0cmFuc2FjdGlvbiwgYm8KICAg ICBnbG9iYWxPYmplY3QtPnN0b3BUaW1lb3V0Q2hlY2soKTsKICAgICAgICAgCiAgICAgaWYgKGV4 ZWMtPmhhZEV4Y2VwdGlvbigpKSB7Ci0gICAgICAgIEpTT2JqZWN0KiBleGNlcHRpb24gPSBleGVj LT5leGNlcHRpb24oKS0+dG9PYmplY3QoZXhlYyk7Ci0gICAgICAgIFN0cmluZyBtZXNzYWdlID0g ZXhjZXB0aW9uLT5nZXQoZXhlYywgZXhlYy0+cHJvcGVydHlOYW1lcygpLm1lc3NhZ2UpLT50b1N0 cmluZyhleGVjKTsKLSAgICAgICAgaW50IGxpbmVOdW1iZXIgPSBleGNlcHRpb24tPmdldChleGVj LCBJZGVudGlmaWVyKGV4ZWMsICJsaW5lIikpLT50b0ludDMyKGV4ZWMpOwotICAgICAgICBTdHJp bmcgc291cmNlVVJMID0gZXhjZXB0aW9uLT5nZXQoZXhlYywgSWRlbnRpZmllcihleGVjLCAic291 cmNlVVJMIikpLT50b1N0cmluZyhleGVjKTsKLSAgICAgICAgbV9kYXRhLT5mcmFtZSgpLT5kb21X aW5kb3coKS0+Y29uc29sZSgpLT5hZGRNZXNzYWdlKEpTTWVzc2FnZVNvdXJjZSwgRXJyb3JNZXNz YWdlTGV2ZWwsIG1lc3NhZ2UsIGxpbmVOdW1iZXIsIHNvdXJjZVVSTCk7CisgICAgICAgIEpTVmFs dWUqIGV4Y2VwdGlvbiA9IGV4ZWMtPmV4Y2VwdGlvbigpOwogICAgICAgICBleGVjLT5jbGVhckV4 Y2VwdGlvbigpOworICAgICAgICBtX2RhdGEtPmZyYW1lKCktPmRvbVdpbmRvdygpLT5jb25zb2xl KCktPnJlcG9ydEV4Y2VwdGlvbihleGVjLCBleGNlcHRpb24pOwogICAgICAgICAKICAgICAgICAg cmFpc2VkRXhjZXB0aW9uID0gdHJ1ZTsKICAgICB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTQ3VzdG9tU1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrLmNwcCBiL1dlYkNvcmUv YmluZGluZ3MvanMvSlNDdXN0b21TUUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2suY3BwCmluZGV4 IDc2ZTg2ZjguLjc1YzE3NGMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDdXN0 b21TUUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2suY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNDdXN0b21TUUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2suY3BwCkBAIC04MywxMiArODMs OSBAQCBib29sIEpTQ3VzdG9tU1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrOjpoYW5kbGVFdmVu dChTUUxFcnJvciogZXJyb3IpCiAgICAgZ2xvYmFsT2JqZWN0LT5zdG9wVGltZW91dENoZWNrKCk7 CiAgICAgICAgIAogICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkgewotICAgICAgICBKU09i amVjdCogZXhjZXB0aW9uID0gZXhlYy0+ZXhjZXB0aW9uKCktPnRvT2JqZWN0KGV4ZWMpOwotICAg ICAgICBTdHJpbmcgbWVzc2FnZSA9IGV4Y2VwdGlvbi0+Z2V0KGV4ZWMsIGV4ZWMtPnByb3BlcnR5 TmFtZXMoKS5tZXNzYWdlKS0+dG9TdHJpbmcoZXhlYyk7Ci0gICAgICAgIGludCBsaW5lTnVtYmVy ID0gZXhjZXB0aW9uLT5nZXQoZXhlYywgSWRlbnRpZmllcihleGVjLCAibGluZSIpKS0+dG9JbnQz MihleGVjKTsKLSAgICAgICAgU3RyaW5nIHNvdXJjZVVSTCA9IGV4Y2VwdGlvbi0+Z2V0KGV4ZWMs IElkZW50aWZpZXIoZXhlYywgInNvdXJjZVVSTCIpKS0+dG9TdHJpbmcoZXhlYyk7Ci0gICAgICAg IG1fZnJhbWUtPmRvbVdpbmRvdygpLT5jb25zb2xlKCktPmFkZE1lc3NhZ2UoSlNNZXNzYWdlU291 cmNlLCBFcnJvck1lc3NhZ2VMZXZlbCwgbWVzc2FnZSwgbGluZU51bWJlciwgc291cmNlVVJMKTsK KyAgICAgICAgSlNWYWx1ZSogZXhjZXB0aW9uID0gZXhlYy0+ZXhjZXB0aW9uKCk7CiAgICAgICAg IGV4ZWMtPmNsZWFyRXhjZXB0aW9uKCk7CisgICAgICAgIG1fZnJhbWUtPmRvbVdpbmRvdygpLT5j b25zb2xlKCktPnJlcG9ydEV4Y2VwdGlvbihleGVjLCBleGNlcHRpb24pOwogICAgIH0KICAgICAg ICAgCiAgICAgRG9jdW1lbnQ6OnVwZGF0ZURvY3VtZW50c1JlbmRlcmluZygpOwpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0N1c3RvbVZvaWRDYWxsYmFjay5jcHAgYi9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTQ3VzdG9tVm9pZENhbGxiYWNrLmNwcAppbmRleCA5MjI3ZTliLi44NTE5 NjEyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3VzdG9tVm9pZENhbGxiYWNr LmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3VzdG9tVm9pZENhbGxiYWNrLmNwcApA QCAtODIsMTIgKzgyLDkgQEAgdm9pZCBKU0N1c3RvbVZvaWRDYWxsYmFjazo6aGFuZGxlRXZlbnQo KQogICAgIGdsb2JhbE9iamVjdC0+c3RvcFRpbWVvdXRDaGVjaygpOwogICAgICAgICAKICAgICBp ZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpIHsKLSAgICAgICAgSlNPYmplY3QqIGV4Y2VwdGlvbiA9 IGV4ZWMtPmV4Y2VwdGlvbigpLT50b09iamVjdChleGVjKTsKLSAgICAgICAgU3RyaW5nIG1lc3Nh Z2UgPSBleGNlcHRpb24tPmdldChleGVjLCBleGVjLT5wcm9wZXJ0eU5hbWVzKCkubWVzc2FnZSkt PnRvU3RyaW5nKGV4ZWMpOwotICAgICAgICBpbnQgbGluZU51bWJlciA9IGV4Y2VwdGlvbi0+Z2V0 KGV4ZWMsIElkZW50aWZpZXIoZXhlYywgImxpbmUiKSktPnRvSW50MzIoZXhlYyk7Ci0gICAgICAg IFN0cmluZyBzb3VyY2VVUkwgPSBleGNlcHRpb24tPmdldChleGVjLCBJZGVudGlmaWVyKGV4ZWMs ICJzb3VyY2VVUkwiKSktPnRvU3RyaW5nKGV4ZWMpOwotICAgICAgICBtX2ZyYW1lLT5kb21XaW5k b3coKS0+Y29uc29sZSgpLT5hZGRNZXNzYWdlKEpTTWVzc2FnZVNvdXJjZSwgRXJyb3JNZXNzYWdl TGV2ZWwsIG1lc3NhZ2UsIGxpbmVOdW1iZXIsIHNvdXJjZVVSTCk7Ci0gICAgICAgIGV4ZWMtPmNs ZWFyRXhjZXB0aW9uKCk7ICAgICAgICAgICAgCisgICAgICAgIEpTVmFsdWUqIGV4Y2VwdGlvbiA9 IGV4ZWMtPmV4Y2VwdGlvbigpOworICAgICAgICBleGVjLT5jbGVhckV4Y2VwdGlvbigpOworICAg ICAgICBtX2ZyYW1lLT5kb21XaW5kb3coKS0+Y29uc29sZSgpLT5yZXBvcnRFeGNlcHRpb24oZXhl YywgZXhjZXB0aW9uKTsgICAgICAgCiAgICAgfQogICAgICAgICAKICAgICBEb2N1bWVudDo6dXBk YXRlRG9jdW1lbnRzUmVuZGVyaW5nKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTQ3VzdG9tWFBhdGhOU1Jlc29sdmVyLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDdXN0 b21YUGF0aE5TUmVzb2x2ZXIuY3BwCmluZGV4IDFiYmU4NGYuLjUyYjFkMzMgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvYmluZGluZ3MvanMvSlNDdXN0b21YUGF0aE5TUmVzb2x2ZXIuY3BwCisrKyBiL1dl YkNvcmUvYmluZGluZ3MvanMvSlNDdXN0b21YUGF0aE5TUmVzb2x2ZXIuY3BwCkBAIC0xMDUsMTIg KzEwNSw5IEBAIFN0cmluZyBKU0N1c3RvbVhQYXRoTlNSZXNvbHZlcjo6bG9va3VwTmFtZXNwYWNl VVJJKGNvbnN0IFN0cmluZyYgcHJlZml4KQogCiAgICAgU3RyaW5nIHJlc3VsdDsKICAgICBpZiAo ZXhlYy0+aGFkRXhjZXB0aW9uKCkpIHsKLSAgICAgICAgSlNPYmplY3QqIGV4Y2VwdGlvbiA9IGV4 ZWMtPmV4Y2VwdGlvbigpLT50b09iamVjdChleGVjKTsKLSAgICAgICAgU3RyaW5nIG1lc3NhZ2Ug PSBleGNlcHRpb24tPmdldChleGVjLCBleGVjLT5wcm9wZXJ0eU5hbWVzKCkubWVzc2FnZSktPnRv U3RyaW5nKGV4ZWMpOwotICAgICAgICBpbnQgbGluZU51bWJlciA9IGV4Y2VwdGlvbi0+Z2V0KGV4 ZWMsIElkZW50aWZpZXIoZXhlYywgImxpbmUiKSktPnRvSW50MzIoZXhlYyk7Ci0gICAgICAgIFN0 cmluZyBzb3VyY2VVUkwgPSBleGNlcHRpb24tPmdldChleGVjLCBJZGVudGlmaWVyKGV4ZWMsICJz b3VyY2VVUkwiKSktPnRvU3RyaW5nKGV4ZWMpOwotICAgICAgICBtX2ZyYW1lLT5kb21XaW5kb3co KS0+Y29uc29sZSgpLT5hZGRNZXNzYWdlKEpTTWVzc2FnZVNvdXJjZSwgRXJyb3JNZXNzYWdlTGV2 ZWwsIG1lc3NhZ2UsIGxpbmVOdW1iZXIsIHNvdXJjZVVSTCk7CisgICAgICAgIEpTVmFsdWUqIGV4 Y2VwdGlvbiA9IGV4ZWMtPmV4Y2VwdGlvbigpOwogICAgICAgICBleGVjLT5jbGVhckV4Y2VwdGlv bigpOworICAgICAgICBtX2ZyYW1lLT5kb21XaW5kb3coKS0+Y29uc29sZSgpLT5yZXBvcnRFeGNl cHRpb24oZXhlYywgZXhjZXB0aW9uKTsKICAgICB9IGVsc2UgewogICAgICAgICBpZiAoIXJldHZh bC0+aXNVbmRlZmluZWRPck51bGwoKSkKICAgICAgICAgICAgIHJlc3VsdCA9IHJldHZhbC0+dG9T dHJpbmcoZXhlYyk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRMaXN0 ZW5lci5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRMaXN0ZW5lci5jcHAKaW5kZXgg MTUzZThmOS4uZThlOTdiMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0V2ZW50 TGlzdGVuZXIuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudExpc3RlbmVyLmNw cApAQCAtOTksMTIgKzk5LDkgQEAgdm9pZCBKU0Fic3RyYWN0RXZlbnRMaXN0ZW5lcjo6aGFuZGxl RXZlbnQoRXZlbnQqIGV2ZW50LCBib29sIGlzV2luZG93RXZlbnQpCiAgICAgICAgIHdpbmRvdy0+ c2V0Q3VycmVudEV2ZW50KHNhdmVkRXZlbnQpOwogCiAgICAgICAgIGlmIChleGVjLT5oYWRFeGNl cHRpb24oKSkgewotICAgICAgICAgICAgSlNPYmplY3QqIGV4Y2VwdGlvbiA9IGV4ZWMtPmV4Y2Vw dGlvbigpLT50b09iamVjdChleGVjKTsKLSAgICAgICAgICAgIFN0cmluZyBtZXNzYWdlID0gZXhj ZXB0aW9uLT5nZXQoZXhlYywgZXhlYy0+cHJvcGVydHlOYW1lcygpLm1lc3NhZ2UpLT50b1N0cmlu ZyhleGVjKTsKLSAgICAgICAgICAgIGludCBsaW5lTnVtYmVyID0gZXhjZXB0aW9uLT5nZXQoZXhl YywgSWRlbnRpZmllcihleGVjLCAibGluZSIpKS0+dG9JbnQzMihleGVjKTsKLSAgICAgICAgICAg IFN0cmluZyBzb3VyY2VVUkwgPSBleGNlcHRpb24tPmdldChleGVjLCBJZGVudGlmaWVyKGV4ZWMs ICJzb3VyY2VVUkwiKSktPnRvU3RyaW5nKGV4ZWMpOwotICAgICAgICAgICAgZnJhbWUtPmRvbVdp bmRvdygpLT5jb25zb2xlKCktPmFkZE1lc3NhZ2UoSlNNZXNzYWdlU291cmNlLCBFcnJvck1lc3Nh Z2VMZXZlbCwgbWVzc2FnZSwgbGluZU51bWJlciwgc291cmNlVVJMKTsKKyAgICAgICAgICAgIEpT VmFsdWUqIGV4Y2VwdGlvbiA9IGV4ZWMtPmV4Y2VwdGlvbigpOwogICAgICAgICAgICAgZXhlYy0+ Y2xlYXJFeGNlcHRpb24oKTsKKyAgICAgICAgICAgIGZyYW1lLT5kb21XaW5kb3coKS0+Y29uc29s ZSgpLT5yZXBvcnRFeGNlcHRpb24oZXhlYywgZXhjZXB0aW9uKTsKICAgICAgICAgfSBlbHNlIHsK ICAgICAgICAgICAgIGlmICghcmV0dmFsLT5pc1VuZGVmaW5lZE9yTnVsbCgpICYmIGV2ZW50LT5z dG9yZXNSZXN1bHRBc1N0cmluZygpKQogICAgICAgICAgICAgICAgIGV2ZW50LT5zdG9yZVJlc3Vs dChyZXR2YWwtPnRvU3RyaW5nKGV4ZWMpKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3Mv anMvU2NoZWR1bGVkQWN0aW9uLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvanMvU2NoZWR1bGVkQWN0 aW9uLmNwcAppbmRleCA3NjQyNDUzLi4yODUyNTVlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRp bmdzL2pzL1NjaGVkdWxlZEFjdGlvbi5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY2hl ZHVsZWRBY3Rpb24uY3BwCkBAIC03NSwxMSArNzUsOSBAQCB2b2lkIFNjaGVkdWxlZEFjdGlvbjo6 ZXhlY3V0ZShKU0RPTVdpbmRvd1NoZWxsKiB3aW5kb3dTaGVsbCkKICAgICAgICAgICAgIGNhbGwo ZXhlYywgbV9mdW5jdGlvbiwgY2FsbFR5cGUsIGNhbGxEYXRhLCB3aW5kb3dTaGVsbCwgYXJncyk7 CiAgICAgICAgICAgICB3aW5kb3ctPnN0b3BUaW1lb3V0Q2hlY2soKTsKICAgICAgICAgICAgIGlm IChleGVjLT5oYWRFeGNlcHRpb24oKSkgewotICAgICAgICAgICAgICAgIEpTT2JqZWN0KiBleGNl cHRpb24gPSBleGVjLT5leGNlcHRpb24oKS0+dG9PYmplY3QoZXhlYyk7CisgICAgICAgICAgICAg ICAgSlNWYWx1ZSogZXhjZXB0aW9uID0gZXhlYy0+ZXhjZXB0aW9uKCk7CiAgICAgICAgICAgICAg ICAgZXhlYy0+Y2xlYXJFeGNlcHRpb24oKTsKLSAgICAgICAgICAgICAgICBTdHJpbmcgbWVzc2Fn ZSA9IGV4Y2VwdGlvbi0+Z2V0KGV4ZWMsIGV4ZWMtPnByb3BlcnR5TmFtZXMoKS5tZXNzYWdlKS0+ dG9TdHJpbmcoZXhlYyk7Ci0gICAgICAgICAgICAgICAgaW50IGxpbmVOdW1iZXIgPSBleGNlcHRp b24tPmdldChleGVjLCBJZGVudGlmaWVyKGV4ZWMsICJsaW5lIikpLT50b0ludDMyKGV4ZWMpOwot ICAgICAgICAgICAgICAgIGZyYW1lLT5kb21XaW5kb3coKS0+Y29uc29sZSgpLT5hZGRNZXNzYWdl KEpTTWVzc2FnZVNvdXJjZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIG1lc3NhZ2UsIGxpbmVOdW1iZXIs IFN0cmluZygpKTsKKyAgICAgICAgICAgICAgICBmcmFtZS0+ZG9tV2luZG93KCktPmNvbnNvbGUo KS0+cmVwb3J0RXhjZXB0aW9uKGV4ZWMsIGV4Y2VwdGlvbik7CiAgICAgICAgICAgICB9CiAgICAg ICAgIH0KICAgICB9IGVsc2UKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0 Q29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3Bw CmluZGV4IDZmN2UxZGQuLjA5M2E3NDggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMv U2NyaXB0Q29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250 cm9sbGVyLmNwcApAQCAtOTcsMTIgKzk3LDggQEAgSlNWYWx1ZSogU2NyaXB0Q29udHJvbGxlcjo6 ZXZhbHVhdGUoY29uc3QgU3RyaW5nJiBzb3VyY2VVUkwsIGludCBiYXNlTGluZSwgY29uc3QKICAg ICAgICAgcmV0dXJuIGNvbXAudmFsdWUoKTsKICAgICB9CiAKLSAgICBpZiAoY29tcC5jb21wbFR5 cGUoKSA9PSBUaHJvdykgewotICAgICAgICBVU3RyaW5nIGVycm9yTWVzc2FnZSA9IGNvbXAudmFs dWUoKS0+dG9TdHJpbmcoZXhlYyk7Ci0gICAgICAgIGludCBsaW5lTnVtYmVyID0gY29tcC52YWx1 ZSgpLT50b09iamVjdChleGVjKS0+Z2V0KGV4ZWMsIElkZW50aWZpZXIoZXhlYywgImxpbmUiKSkt PnRvSW50MzIoZXhlYyk7Ci0gICAgICAgIFVTdHJpbmcgZXhjZXB0aW9uU291cmNlVVJMID0gY29t cC52YWx1ZSgpLT50b09iamVjdChleGVjKS0+Z2V0KGV4ZWMsIElkZW50aWZpZXIoZXhlYywgInNv dXJjZVVSTCIpKS0+dG9TdHJpbmcoZXhlYyk7Ci0gICAgICAgIG1fZnJhbWUtPmRvbVdpbmRvdygp LT5jb25zb2xlKCktPmFkZE1lc3NhZ2UoSlNNZXNzYWdlU291cmNlLCBFcnJvck1lc3NhZ2VMZXZl bCwgZXJyb3JNZXNzYWdlLCBsaW5lTnVtYmVyLCBleGNlcHRpb25Tb3VyY2VVUkwpOwotICAgIH0K KyAgICBpZiAoY29tcC5jb21wbFR5cGUoKSA9PSBUaHJvdykKKyAgICAgICAgbV9mcmFtZS0+ZG9t V2luZG93KCktPmNvbnNvbGUoKS0+cmVwb3J0RXhjZXB0aW9uKGV4ZWMsIGNvbXAudmFsdWUoKSk7 CiAKICAgICBtX3NvdXJjZVVSTCA9IHNhdmVkU291cmNlVVJMOwogICAgIHJldHVybiAwOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9vYmpjL1dlYlNjcmlwdE9iamVjdC5tbSBiL1dlYkNv cmUvYmluZGluZ3Mvb2JqYy9XZWJTY3JpcHRPYmplY3QubW0KaW5kZXggMTdiMzExOC4uZDY0MzEw MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9vYmpjL1dlYlNjcmlwdE9iamVjdC5tbQor KysgYi9XZWJDb3JlL2JpbmRpbmdzL29iamMvV2ViU2NyaXB0T2JqZWN0Lm1tCkBAIC04OSwxMyAr ODksMTEgQEAgaWQgY3JlYXRlSlNXcmFwcGVyKEtKUzo6SlNPYmplY3QqIG9iamVjdCwgUGFzc1Jl ZlB0cjxLSlM6OkJpbmRpbmdzOjpSb290T2JqZWN0Pgogc3RhdGljIHZvaWQgYWRkRXhjZXB0aW9u VG9Db25zb2xlKEV4ZWNTdGF0ZSogZXhlYykKIHsKICAgICBKU0RPTVdpbmRvdyogd2luZG93ID0g YXNKU0RPTVdpbmRvdyhleGVjLT5keW5hbWljR2xvYmFsT2JqZWN0KCkpOwotICAgIEpTT2JqZWN0 KiBleGNlcHRpb24gPSBleGVjLT5leGNlcHRpb24oKS0+dG9PYmplY3QoZXhlYyk7CisgICAgSlNW YWx1ZSogZXhjZXB0aW9uID0gZXhlYy0+ZXhjZXB0aW9uKCk7CiAgICAgaWYgKCF3aW5kb3cgfHwg IWV4Y2VwdGlvbikKICAgICAgICAgcmV0dXJuOwotICAgIFN0cmluZyBtZXNzYWdlID0gZXhjZXB0 aW9uLT5nZXQoZXhlYywgZXhlYy0+cHJvcGVydHlOYW1lcygpLm1lc3NhZ2UpLT50b1N0cmluZyhl eGVjKTsKLSAgICBpbnQgbGluZU51bWJlciA9IGV4Y2VwdGlvbi0+Z2V0KGV4ZWMsIElkZW50aWZp ZXIoZXhlYywgImxpbmUiKSktPnRvSW50MzIoZXhlYyk7Ci0gICAgU3RyaW5nIHNvdXJjZVVSTCA9 IGV4Y2VwdGlvbi0+Z2V0KGV4ZWMsIElkZW50aWZpZXIoZXhlYywgInNvdXJjZVVSTCIpKS0+dG9T dHJpbmcoZXhlYyk7Ci0gICAgd2luZG93LT5pbXBsKCktPmNvbnNvbGUoKS0+YWRkTWVzc2FnZShK U01lc3NhZ2VTb3VyY2UsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdlLCBsaW5lTnVtYmVyLCBz b3VyY2VVUkwpOworICAgIGV4ZWMtPmNsZWFyRXhjZXB0aW9uKCk7CisgICAgd2luZG93LT5pbXBs KCktPmNvbnNvbGUoKS0+cmVwb3J0RXhjZXB0aW9uKGV4ZWMsIGV4Y2VwdGlvbik7CiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9Db25zb2xlLmNw cCBiL1dlYkNvcmUvcGFnZS9Db25zb2xlLmNwcAppbmRleCBlMDk4NWIxLi5jYTcwODA3IDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BhZ2UvQ29uc29sZS5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL0NvbnNv bGUuY3BwCkBAIC0yOTUsNCArMjk1LDEyIEBAIHZvaWQgQ29uc29sZTo6d2FybihFeGVjU3RhdGUq IGV4ZWMsIGNvbnN0IEFyZ0xpc3QmIGFyZ3VtZW50cykKICAgICBwcmludFRvU3RhbmRhcmRPdXQo V2FybmluZ01lc3NhZ2VMZXZlbCwgZXhlYywgYXJndW1lbnRzLCB1cmwpOwogfQogCit2b2lkICBD b25zb2xlOjpyZXBvcnRFeGNlcHRpb24oRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlKiBleGNlcHRp b24pCit7CisgICAgVVN0cmluZyBlcnJvck1lc3NhZ2UgPSBleGNlcHRpb24tPnRvU3RyaW5nKGV4 ZWMpOworICAgIGludCBsaW5lTnVtYmVyID0gZXhjZXB0aW9uLT50b09iamVjdChleGVjKS0+Z2V0 KGV4ZWMsIElkZW50aWZpZXIoZXhlYywgImxpbmUiKSktPnRvSW50MzIoZXhlYyk7CisgICAgVVN0 cmluZyBleGNlcHRpb25Tb3VyY2VVUkwgPSBleGNlcHRpb24tPnRvT2JqZWN0KGV4ZWMpLT5nZXQo ZXhlYywgSWRlbnRpZmllcihleGVjLCAic291cmNlVVJMIikpLT50b1N0cmluZyhleGVjKTsKKyAg ICBhZGRNZXNzYWdlKEpTTWVzc2FnZVNvdXJjZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIGVycm9yTWVz c2FnZSwgbGluZU51bWJlciwgZXhjZXB0aW9uU291cmNlVVJMKTsKK30KKwogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0NvbnNvbGUuaCBiL1dlYkNvcmUv cGFnZS9Db25zb2xlLmgKaW5kZXggNjRhZTQ5MC4uNjkxZDJkMSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wYWdlL0NvbnNvbGUuaAorKysgYi9XZWJDb3JlL3BhZ2UvQ29uc29sZS5oCkBAIC0zOCw2ICsz OCw3IEBAIG5hbWVzcGFjZSBLSlMgewogICAgIGNsYXNzIEV4ZWNTdGF0ZTsKICAgICBjbGFzcyBB cmdMaXN0OwogICAgIGNsYXNzIFByb2ZpbGU7CisgICAgY2xhc3MgSlNWYWx1ZTsKIH0KIAogbmFt ZXNwYWNlIFdlYkNvcmUgewpAQCAtNzksNiArODAsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK ICAgICAgICAgdm9pZCBmaW5pc2hlZFByb2ZpbGluZyhQYXNzUmVmUHRyPEtKUzo6UHJvZmlsZT4p OwogCisgICAgICAgIHZvaWQgcmVwb3J0RXhjZXB0aW9uKEtKUzo6RXhlY1N0YXRlKiwgS0pTOjpK U1ZhbHVlKik7CiAgICAgcHJpdmF0ZToKICAgICAgICAgQ29uc29sZShGcmFtZSopOwogICAgICAg ICAK