75573 2012-01-04 14:05:29 -0800 [chromium] Make it safe to delete WorkerFileSystemContextObserver on any thread. 2012-01-04 19:11:18 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 74666 1 levin levin dimich dslomov levin+threading webkit.review.bot oldest_to_newest 529739 0 levin 2012-01-04 14:05:29 -0800 See summary. 529757 1 121154 levin 2012-01-04 14:23:12 -0800 Created attachment 121154 Patch 529762 2 121155 levin 2012-01-04 14:27:16 -0800 Created attachment 121155 Patch 529764 3 121156 levin 2012-01-04 14:28:27 -0800 Created attachment 121156 Patch 529771 4 121156 dimich 2012-01-04 14:40:59 -0800 Comment on attachment 121156 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121156&action=review Nice, one comment: > Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp:170 > + // so WorkerFileSystemCallbacksBridge will be valid while this class is around. Need to fix comment as discussed offline. 529952 5 levin 2012-01-04 19:11:18 -0800 Committed as http://trac.webkit.org/changeset/104111 121154 2012-01-04 14:23:12 -0800 2012-01-04 14:27:12 -0800 Patch bug-75573-20120104142311.patch text/plain 9089 levin U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDA5ZGQyZTY2MzU2ZWI0NzAyZTUzMGU2ZTViZTMxMjllMjc3YWQ0NDAuLjBmNzkzMGI2NTc2ZWIx NWRiODBhN2NiYmMwMmVhYTZhOGI4NjMxNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTItMDEtMDQgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gTWFrZSBpdCBzYWZlIHRvIGRlbGV0ZSBXb3JrZXJG aWxlU3lzdGVtQ29udGV4dE9ic2VydmVyIG9uIGFueSB0aHJlYWQuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTU3MworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3JjL1dvcmtlckZpbGVTeXN0ZW1DYWxs YmFja3NCcmlkZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlU3lzdGVtQ29udGV4 dE9ic2VydmVyKTogTW92ZSB0aGUgV29ya2VyQ29udGV4dE9ic2VydmVyCisgICAgICAgIG91dCBv ZiB0aGUgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSBzaW5jZSBhbiBvYnNlcnZlciBz aG91bGQgYmUKKyAgICAgICAgZGVzdHJveWVkIG9uIHRoZSBXb3JrZXJDb250ZXh0IHRocmVhZC4g KEFjdHVhbGx5LCBpdCBjb3VsZCBiZSBkZXN0cm95ZWQgb24gZWl0aGVyCisgICAgICAgIHRocmVh ZCBpZiB5b3UgYXJlIGNhcmVmdWwgdG8gbWFrZSBhIGNlcnRhaW4gbWV0aG9kIGNhbGwgb24gaXQg d2hpbGUgb24gdGhlIFdvcmtlckNvbnRleHQKKyAgICAgICAgdGhyZWFkIGJ1dCB0cnlpbmcgdGhh dCBpcyBhIG1vcmUgZnJhZ2lsZSBwYXR0ZXJuLikKKyAgICAgICAgKFdlYktpdDo6V29ya2VyRmls ZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6c3RvcCk6IEZhY3RvciBvdXQgdGhlIGNsZWFuIHVwIGFu ZCBtYWtlIGl0CisgICAgICAgIGNsZWFyIHdoYXQgdGhlIG11dGV4IGlzIGd1YXJkaW5nLgorICAg ICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpjbGVhblVwQWZ0 ZXJDYWxsYmFjayk6IERlbGV0ZQorICAgICAgICB0aGUgb2JzZXJ2ZXIuIER1ZSB0byB3aGVyZSB0 aGlzIGlzIGNhbGxlZCBmcm9tLCBpdCBpcyBhbHdheXMgY2FsbGVkIG9uIHRoZSBXb3JrZXJDb250 ZXh0IHRocmVhZC4KKyAgICAgICAgKFdlYktpdDo6V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0Jy aWRnZTo6cnVuVGFza09uV29ya2VyVGhyZWFkKTogUmVwbGFjZSBzb21lIGNvZGUgd2l0aAorICAg ICAgICB0aGUgY2xlYW5VcEFmdGVyQ2FsbGJhY2sgY2FsbC4KKyAgICAgICAgKFdlYktpdDo6V29y a2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6bWF5UG9zdFRhc2tUb1dvcmtlcik6CisgICAg ICAgICogc3JjL1dvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuaDogSW4gYWRkaXRpb24g dG8gc29tZSBjb21tZW50IGNsZWFuIHVwcyBhbmQgY29kZSBmYWN0b3JpbmcsCisgICAgICAgIEkg bWFkZSB0aGUgZGVzY3RydWN0b3IgcHJpdmF0ZSBzaW5jZSBubyBvbmUgc2hvdWxkIGNhbGwgaXQg ZGlyZWN0bHkuCisKIDIwMTItMDEtMDQgIEFkcmllbm5lIFdhbGtlciAgPGVubmVAZ29vZ2xlLmNv bT4KIAogICAgICAgICBbY2hyb21pdW1dIENyZWF0ZSB1bml0IHRlc3RzIGZvciBDQ1RpbGVkTGF5 ZXJJbXBsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJGaWxl U3lzdGVtQ2FsbGJhY2tzQnJpZGdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dv cmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuY3BwCmluZGV4IDhjZTVlNjk3NmJiMDkxOTNk M2E3NDA5YTVhMWNmNzhmYzRjMDU1NzEuLjZjMTY2ZjQyNDkzYmZlYWMxMmJiNmVlZjcwYjk2MGNi NmYxNDNlOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtlckZp bGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuY3BwCkBAIC0xNDQsMTUgKzE0NCw1 NSBAQCBwcml2YXRlOgogICAgIGNvbnN0IFN0cmluZyBtX21vZGU7CiB9OwogCisvLyBPYnNlcnZl cyB0aGUgd29ya2VyIGNvbnRleHQuIEJ5IGtlZXBpbmcgdGhpcyBzZXBhcmF0ZSwgaXQgaXMgZWFz aWVyIHRvIHZlcmlmeQorLy8gdGhhdCBpdCBvbmx5IGdldHMgZGVsZXRlZCBvbiB0aGUgd29ya2Vy IGNvbnRleHQgdGhyZWFkIHdoaWNoIGlzIHZlcmlmaWVkIGJ5IH5PYnNlcnZlci4KK2NsYXNzIFdv cmtlckZpbGVTeXN0ZW1Db250ZXh0T2JzZXJ2ZXIgOiBwdWJsaWMgV2ViQ29yZTo6V29ya2VyQ29u dGV4dDo6T2JzZXJ2ZXIgeworcHVibGljOgorICAgIHN0YXRpYyBQYXNzT3duUHRyPFdvcmtlckZp bGVTeXN0ZW1Db250ZXh0T2JzZXJ2ZXI+IGNyZWF0ZShXb3JrZXJDb250ZXh0KiBjb250ZXh0LCBX b3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlKiBicmlkZ2UpCisgICAgeworICAgICAgICBy ZXR1cm4gYWRvcHRQdHIobmV3IFdvcmtlckZpbGVTeXN0ZW1Db250ZXh0T2JzZXJ2ZXIoY29udGV4 dCwgYnJpZGdlKSk7CisgICAgfQorCisgICAgLy8gV29ya2VyQ29udGV4dDo6T2JzZXJ2ZXIgbWV0 aG9kLgorICAgIHZpcnR1YWwgdm9pZCBub3RpZnlTdG9wKCkKKyAgICB7CisgICAgICAgIG1fYnJp ZGdlLT5zdG9wKCk7CisgICAgfQorCitwcml2YXRlOgorICAgIFdvcmtlckZpbGVTeXN0ZW1Db250 ZXh0T2JzZXJ2ZXIoV29ya2VyQ29udGV4dCogY29udGV4dCwgV29ya2VyRmlsZVN5c3RlbUNhbGxi YWNrc0JyaWRnZSogYnJpZGdlKQorICAgICAgICA6IFdlYkNvcmU6OldvcmtlckNvbnRleHQ6Ok9i c2VydmVyKGNvbnRleHQpCisgICAgICAgICwgbV9icmlkZ2UoYnJpZGdlKQorICAgIHsKKyAgICB9 CisKKyAgICAvLyBBbHRob3VnaCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlIG1hbmFn ZXMgdGhlIGxpZmV0aW1lIG9mIHRoaXMgY2xhc3MsCisgICAgLy8gc28gV29ya2VyRmlsZVN5c3Rl bUNhbGxiYWNrc0JyaWRnZSB3aWxsIGJlIHZhbGlkIHdoaWxlIHRoaXMgY2xhc3MgaXMgYXJvdW5k LgorICAgIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UqIG1fYnJpZGdlOworfTsKKwog dm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpzdG9wKCkKIHsKICAgICBBU1NF UlQobV93b3JrZXJDb250ZXh0LT5pc0NvbnRleHRUaHJlYWQoKSk7Ci0gICAgTXV0ZXhMb2NrZXIg bG9ja2VyKG1fbXV0ZXgpOwotICAgIG1fd29ya2VyTG9hZGVyUHJveHkgPSAwOworICAgIHsKKyAg ICAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fbG9hZGVyUHJveHlNdXRleCk7CisgICAgICAgIG1f d29ya2VyTG9hZGVyUHJveHkgPSAwOworICAgIH0KIAotICAgIGlmIChtX2NhbGxiYWNrc09uV29y a2VyVGhyZWFkKSB7CisgICAgaWYgKG1fY2FsbGJhY2tzT25Xb3JrZXJUaHJlYWQpCiAgICAgICAg IG1fY2FsbGJhY2tzT25Xb3JrZXJUaHJlYWQtPmRpZEZhaWwoV2ViRmlsZUVycm9yQWJvcnQpOwot ICAgICAgICBtX2NhbGxiYWNrc09uV29ya2VyVGhyZWFkID0gMDsKKworICAgIGNsZWFuVXBBZnRl ckNhbGxiYWNrKCk7Cit9CisKK3ZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6 Y2xlYW5VcEFmdGVyQ2FsbGJhY2soKQoreworICAgIEFTU0VSVChtX3dvcmtlckNvbnRleHQtPmlz Q29udGV4dFRocmVhZCgpKTsKKworICAgIG1fY2FsbGJhY2tzT25Xb3JrZXJUaHJlYWQgPSAwOwor ICAgIGlmIChtX3dvcmtlckNvbnRleHRPYnNlcnZlcikgeworICAgICAgICBkZWxldGUgbV93b3Jr ZXJDb250ZXh0T2JzZXJ2ZXI7CisgICAgICAgIG1fd29ya2VyQ29udGV4dE9ic2VydmVyID0gMDsK ICAgICB9CiB9CiAKQEAgLTM5NCw4ICs0MzQsMTEgQEAgdm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2Fs bGJhY2tzQnJpZGdlOjpydW5UYXNrT25Xb3JrZXJUaHJlYWQoV2ViQ29yZTo6U2NyaXB0RXhlY3UK ICAgICAgICAgcmV0dXJuOwogICAgIEFTU0VSVChicmlkZ2UtPm1fd29ya2VyQ29udGV4dC0+aXND b250ZXh0VGhyZWFkKCkpOwogICAgIHRhc2tUb1J1bi0+cGVyZm9ybVRhc2soc2NyaXB0RXhlY3V0 aW9uQ29udGV4dCk7Ci0gICAgYnJpZGdlLT5tX2NhbGxiYWNrc09uV29ya2VyVGhyZWFkID0gMDsK LSAgICBicmlkZ2UtPnN0b3BPYnNlcnZpbmcoKTsKKworICAgIC8vIHRhc2tUb1J1biBkb2VzIHRo ZSBjYWxsYmFjay4KKyAgICBicmlkZ2UtPmNsZWFuVXBBZnRlckNhbGxiYWNrKCk7CisKKyAgICAv LyBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlIG1heSBiZSBkZWxldGVkIGhlcmUgd2hl biBicmlkZ2UgZ29lcyBvdXQgb2Ygc2NvcGUuCiB9CiAKIHZvaWQgV29ya2VyRmlsZVN5c3RlbUNh bGxiYWNrc0JyaWRnZTo6ZGlzcGF0Y2hUYXNrVG9NYWluVGhyZWFkKFBhc3NPd25QdHI8V2ViQ29y ZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6VGFzaz4gdGFzaykKQEAgLTQxMyw5ICs0NTYsMTEg QEAgdm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjptYXlQb3N0VGFza1RvV29y a2VyKFBhc3NPd25QdHI8U2NyaXB0RXhlY3UKICAgICAvLyBpbiB0aGUgZGVzdHJ1Y3Rpb24gb2Yg V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSwgdGhlIG9yZGVyaW5nIG9mIHRoZSBSZWZQ dHIgYW5kIHRoZSBNdXRleExvY2tlcgogICAgIC8vIGlzIHZlcnkgaW1wb3J0YW50LCB0byBlbnN1 cmUgdGhhdCB0aGUgbV9tdXRleCBpcyBzdGlsbCB2YWxpZCB3aGVuIGl0IGdldHMgdW5sb2NrZWQu KQogICAgIFJlZlB0cjxXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiBicmlkZ2UgPSBh ZG9wdFJlZih0aGlzKTsKLSAgICBNdXRleExvY2tlciBsb2NrZXIobV9tdXRleCk7CisgICAgTXV0 ZXhMb2NrZXIgbG9ja2VyKG1fbG9hZGVyUHJveHlNdXRleCk7CiAgICAgaWYgKG1fd29ya2VyTG9h ZGVyUHJveHkpCiAgICAgICAgIG1fd29ya2VyTG9hZGVyUHJveHktPnBvc3RUYXNrRm9yTW9kZVRv V29ya2VyQ29udGV4dChjcmVhdGVDYWxsYmFja1Rhc2soJnJ1blRhc2tPbldvcmtlclRocmVhZCwg YnJpZGdlLCB0YXNrKSwgbW9kZSk7CisKKyAgICAvLyBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tz QnJpZGdlIG1heSBiZSBkZWxldGVkIGhlcmUgd2hlbiBicmlkZ2UgZ29lcyBvdXQgb2Ygc2NvcGUu CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuaCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuaAppbmRl eCA5YzQ0Y2IxYTk3NmU4ZDY1MmUwNjA0ZmM2MWU3MGE5MmUzYTJlZGU5Li5hMTcyNWQwN2JmNTQ4 NDdhZDVkMzJiNmM2ZTY2YmQ0YjcwNmFjM2UwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9Xb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlLmgKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZS5oCkBA IC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMCBHb29nbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEwLCAyMDEyIEdvb2dsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24s IGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJl CkBAIC0zOCw3ICszOCw2IEBACiAjaW5jbHVkZSAiV2ViRmlsZUVycm9yLmgiCiAjaW5jbHVkZSAi cGxhdGZvcm0vV2ViRmlsZVN5c3RlbS5oIgogI2luY2x1ZGUgInBsYXRmb3JtL1dlYlZlY3Rvci5o IgotI2luY2x1ZGUgIldvcmtlckNvbnRleHQuaCIKICNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5o PgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1RocmVhZGluZy5o PgpAQCAtNTQsMTAgKzUzLDExIEBAIGNsYXNzIE1haW5UaHJlYWRGaWxlU3lzdGVtQ2FsbGJhY2tz OwogY2xhc3MgV2ViQ29tbW9uV29ya2VyQ2xpZW50OwogY2xhc3MgVGhyZWFkYWJsZUNhbGxiYWNr c0JyaWRnZVdyYXBwZXI7CiBjbGFzcyBXZWJGaWxlU3lzdGVtQ2FsbGJhY2tzOworY2xhc3MgV29y a2VyRmlsZVN5c3RlbUNvbnRleHRPYnNlcnZlcjsKIHN0cnVjdCBXZWJGaWxlSW5mbzsKIHN0cnVj dCBXZWJGaWxlU3lzdGVtRW50cnk7CiAKLS8vIFRoaXMgY2xhc3MgaXMgdXNlZCB0byBwb3N0IGEg b3BlbkZpbGVTeXN0ZW0gcmVxdWVzdCB0byB0aGUgbWFpbiB0aHJlYWQgYW5kIGdldCBjYWxsZWQg YmFjayBmb3IgdGhlIHJlcXVlc3QuIFRoaXMgbXVzdCBiZSBkZXN0cnVjdGVkIG9uIHRoZSB3b3Jr ZXIgdGhyZWFkLgorLy8gVXNlZCB0byBwb3N0IGEgb3BlbkZpbGVTeXN0ZW0gcmVxdWVzdCB0byB0 aGUgbWFpbiB0aHJlYWQgYW5kIGdldCBjYWxsZWQgYmFjayBmb3IgdGhlIHJlcXVlc3QuCiAvLwog Ly8gQSB0eXBpY2FsIGZsb3cgZm9yIG9wZW5GaWxlU3lzdGVtIHdvdWxkIGxvb2sgbGlrZSB0aGlz OgogLy8gQnJpZGdlOjpwb3N0T3BlbkZpbGVTeXN0ZW1Ub01haW5UaHJlYWQoKSBvbiBXb3JrZXJU aHJlYWQKQEAgLTY5LDE2ICs2OSw4IEBAIHN0cnVjdCBXZWJGaWxlU3lzdGVtRW50cnk7CiAvLyAg LS0+IEJyaWRnZTo6ZGlkWHh4T25Xb3JrZXJUaHJlYWQgaXMgY2FsbGVkIG9uIFdvcmtlclRocmVh ZAogLy8gICAgICBUaGlzIGNhbGxzIHRoZSBvcmlnaW5hbCBjYWxsYmFja3MgKG1fY2FsbGJhY2tz T25Xb3JrZXJUaHJlYWQpIGFuZAogLy8gICAgICByZWxlYXNlcyBhIHNlbGYtcmVmZXJlbmNlIHRv IHRoZSBicmlkZ2UuCi1jbGFzcyBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlIDogcHVi bGljIFRocmVhZFNhZmVSZWZDb3VudGVkPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U+ LCBwdWJsaWMgV2ViQ29yZTo6V29ya2VyQ29udGV4dDo6T2JzZXJ2ZXIgeworY2xhc3MgV29ya2Vy RmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxX b3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiB7CiBwdWJsaWM6Ci0gICAgfldvcmtlckZp bGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UoKTsKLQotICAgIC8vIFdvcmtlckNvbnRleHQ6Ok9ic2Vy dmVyIG1ldGhvZC4KLSAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5U3RvcCgpCi0gICAgewotICAgICAg ICBzdG9wKCk7Ci0gICAgfQotCiAgICAgdm9pZCBzdG9wKCk7CiAKICAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiBjcmVhdGUoV2ViQ29yZTo6V29y a2VyTG9hZGVyUHJveHkqIHdvcmtlckxvYWRlclByb3h5LCBXZWJDb3JlOjpTY3JpcHRFeGVjdXRp b25Db250ZXh0KiB3b3JrZXJDb250ZXh0LCBXZWJGaWxlU3lzdGVtQ2FsbGJhY2tzKiBjYWxsYmFj a3MpCkBAIC0xMDcsNyArOTksMTAgQEAgcHVibGljOgogICAgIHZvaWQgZGlkUmVhZERpcmVjdG9y eU9uTWFpblRocmVhZChjb25zdCBXZWJWZWN0b3I8V2ViRmlsZVN5c3RlbUVudHJ5PiYsIGJvb2wg aGFzTW9yZSwgY29uc3QgU3RyaW5nJiBtb2RlKTsKIAogcHJpdmF0ZToKKyAgICBmcmllbmQgY2xh c3MgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZT47 CisKICAgICBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlKFdlYkNvcmU6Oldvcmtlckxv YWRlclByb3h5KiwgV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdlYkZpbGVTeXN0 ZW1DYWxsYmFja3MqKTsKKyAgICB+V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSgpOwog CiAgICAgLy8gTWV0aG9kcyB0aGF0IGFyZSB0byBiZSBjYWxsZWQgb24gdGhlIG1haW4gdGhyZWFk LgogICAgIHN0YXRpYyB2b2lkIG9wZW5GaWxlU3lzdGVtT25NYWluVGhyZWFkKFdlYkNvcmU6OlNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBXZWJDb21tb25Xb3JrZXJDbGllbnQqLCBXZWJGaWxlU3lz dGVtOjpUeXBlLCBsb25nIGxvbmcgc2l6ZSwgYm9vbCBjcmVhdGUsIFdvcmtlckZpbGVTeXN0ZW1D YWxsYmFja3NCcmlkZ2UqLCBjb25zdCBTdHJpbmcmIG1vZGUpOwpAQCAtMTM3LDEwICsxMzIsMTYg QEAgcHJpdmF0ZToKICAgICB2b2lkIGRpc3BhdGNoVGFza1RvTWFpblRocmVhZChQYXNzT3duUHRy PFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OlRhc2s+KTsKICAgICB2b2lkIG1heVBv c3RUYXNrVG9Xb3JrZXIoUGFzc093blB0cjxXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0 OjpUYXNrPiwgY29uc3QgU3RyaW5nJiBtb2RlKTsKIAotICAgIE11dGV4IG1fbXV0ZXg7CisgICAg dm9pZCBjbGVhblVwQWZ0ZXJDYWxsYmFjaygpOworCisgICAgTXV0ZXggbV9sb2FkZXJQcm94eU11 dGV4OwogICAgIFdlYkNvcmU6OldvcmtlckxvYWRlclByb3h5KiBtX3dvcmtlckxvYWRlclByb3h5 OworCiAgICAgV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCogbV93b3JrZXJDb250ZXh0 OwogCisgICAgLy8gTXVzdCBiZSBkZWxldGVkIG9uIHRoZSBXb3JrZXJDb250ZXh0IHRocmVhZC4K KyAgICBXb3JrZXJGaWxlU3lzdGVtQ29udGV4dE9ic2VydmVyKiBtX3dvcmtlckNvbnRleHRPYnNl cnZlcjsKKwogICAgIC8vIFRoaXMgaXMgc2VsZi1kZXN0cnVjdGVkIGFuZCBtdXN0IGJlIGZpcmVk IG9uIHRoZSB3b3JrZXIgdGhyZWFkLgogICAgIFdlYkZpbGVTeXN0ZW1DYWxsYmFja3MqIG1fY2Fs bGJhY2tzT25Xb3JrZXJUaHJlYWQ7CiB9Owo= 121155 2012-01-04 14:27:16 -0800 2012-01-04 14:28:22 -0800 Patch bug-75573-20120104142714.patch text/plain 9844 levin U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDA5ZGQyZTY2MzU2ZWI0NzAyZTUzMGU2ZTViZTMxMjllMjc3YWQ0NDAuLjBmNzkzMGI2NTc2ZWIx NWRiODBhN2NiYmMwMmVhYTZhOGI4NjMxNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTItMDEtMDQgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gTWFrZSBpdCBzYWZlIHRvIGRlbGV0ZSBXb3JrZXJG aWxlU3lzdGVtQ29udGV4dE9ic2VydmVyIG9uIGFueSB0aHJlYWQuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTU3MworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3JjL1dvcmtlckZpbGVTeXN0ZW1DYWxs YmFja3NCcmlkZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlU3lzdGVtQ29udGV4 dE9ic2VydmVyKTogTW92ZSB0aGUgV29ya2VyQ29udGV4dE9ic2VydmVyCisgICAgICAgIG91dCBv ZiB0aGUgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSBzaW5jZSBhbiBvYnNlcnZlciBz aG91bGQgYmUKKyAgICAgICAgZGVzdHJveWVkIG9uIHRoZSBXb3JrZXJDb250ZXh0IHRocmVhZC4g KEFjdHVhbGx5LCBpdCBjb3VsZCBiZSBkZXN0cm95ZWQgb24gZWl0aGVyCisgICAgICAgIHRocmVh ZCBpZiB5b3UgYXJlIGNhcmVmdWwgdG8gbWFrZSBhIGNlcnRhaW4gbWV0aG9kIGNhbGwgb24gaXQg d2hpbGUgb24gdGhlIFdvcmtlckNvbnRleHQKKyAgICAgICAgdGhyZWFkIGJ1dCB0cnlpbmcgdGhh dCBpcyBhIG1vcmUgZnJhZ2lsZSBwYXR0ZXJuLikKKyAgICAgICAgKFdlYktpdDo6V29ya2VyRmls ZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6c3RvcCk6IEZhY3RvciBvdXQgdGhlIGNsZWFuIHVwIGFu ZCBtYWtlIGl0CisgICAgICAgIGNsZWFyIHdoYXQgdGhlIG11dGV4IGlzIGd1YXJkaW5nLgorICAg ICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpjbGVhblVwQWZ0 ZXJDYWxsYmFjayk6IERlbGV0ZQorICAgICAgICB0aGUgb2JzZXJ2ZXIuIER1ZSB0byB3aGVyZSB0 aGlzIGlzIGNhbGxlZCBmcm9tLCBpdCBpcyBhbHdheXMgY2FsbGVkIG9uIHRoZSBXb3JrZXJDb250 ZXh0IHRocmVhZC4KKyAgICAgICAgKFdlYktpdDo6V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0Jy aWRnZTo6cnVuVGFza09uV29ya2VyVGhyZWFkKTogUmVwbGFjZSBzb21lIGNvZGUgd2l0aAorICAg ICAgICB0aGUgY2xlYW5VcEFmdGVyQ2FsbGJhY2sgY2FsbC4KKyAgICAgICAgKFdlYktpdDo6V29y a2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6bWF5UG9zdFRhc2tUb1dvcmtlcik6CisgICAg ICAgICogc3JjL1dvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuaDogSW4gYWRkaXRpb24g dG8gc29tZSBjb21tZW50IGNsZWFuIHVwcyBhbmQgY29kZSBmYWN0b3JpbmcsCisgICAgICAgIEkg bWFkZSB0aGUgZGVzY3RydWN0b3IgcHJpdmF0ZSBzaW5jZSBubyBvbmUgc2hvdWxkIGNhbGwgaXQg ZGlyZWN0bHkuCisKIDIwMTItMDEtMDQgIEFkcmllbm5lIFdhbGtlciAgPGVubmVAZ29vZ2xlLmNv bT4KIAogICAgICAgICBbY2hyb21pdW1dIENyZWF0ZSB1bml0IHRlc3RzIGZvciBDQ1RpbGVkTGF5 ZXJJbXBsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJGaWxl U3lzdGVtQ2FsbGJhY2tzQnJpZGdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dv cmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuY3BwCmluZGV4IDhjZTVlNjk3NmJiMDkxOTNk M2E3NDA5YTVhMWNmNzhmYzRjMDU1NzEuLjMwNWVlZGJkOTUxODU5M2E4ZmZiYzYxOThkZjk5MGMy OWRjZDE0YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtlckZp bGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuY3BwCkBAIC0xNDQsMTUgKzE0NCw1 NSBAQCBwcml2YXRlOgogICAgIGNvbnN0IFN0cmluZyBtX21vZGU7CiB9OwogCisvLyBPYnNlcnZl cyB0aGUgd29ya2VyIGNvbnRleHQuIEJ5IGtlZXBpbmcgdGhpcyBzZXBhcmF0ZSwgaXQgaXMgZWFz aWVyIHRvIHZlcmlmeQorLy8gdGhhdCBpdCBvbmx5IGdldHMgZGVsZXRlZCBvbiB0aGUgd29ya2Vy IGNvbnRleHQgdGhyZWFkIHdoaWNoIGlzIHZlcmlmaWVkIGJ5IH5PYnNlcnZlci4KK2NsYXNzIFdv cmtlckZpbGVTeXN0ZW1Db250ZXh0T2JzZXJ2ZXIgOiBwdWJsaWMgV2ViQ29yZTo6V29ya2VyQ29u dGV4dDo6T2JzZXJ2ZXIgeworcHVibGljOgorICAgIHN0YXRpYyBQYXNzT3duUHRyPFdvcmtlckZp bGVTeXN0ZW1Db250ZXh0T2JzZXJ2ZXI+IGNyZWF0ZShXb3JrZXJDb250ZXh0KiBjb250ZXh0LCBX b3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlKiBicmlkZ2UpCisgICAgeworICAgICAgICBy ZXR1cm4gYWRvcHRQdHIobmV3IFdvcmtlckZpbGVTeXN0ZW1Db250ZXh0T2JzZXJ2ZXIoY29udGV4 dCwgYnJpZGdlKSk7CisgICAgfQorCisgICAgLy8gV29ya2VyQ29udGV4dDo6T2JzZXJ2ZXIgbWV0 aG9kLgorICAgIHZpcnR1YWwgdm9pZCBub3RpZnlTdG9wKCkKKyAgICB7CisgICAgICAgIG1fYnJp ZGdlLT5zdG9wKCk7CisgICAgfQorCitwcml2YXRlOgorICAgIFdvcmtlckZpbGVTeXN0ZW1Db250 ZXh0T2JzZXJ2ZXIoV29ya2VyQ29udGV4dCogY29udGV4dCwgV29ya2VyRmlsZVN5c3RlbUNhbGxi YWNrc0JyaWRnZSogYnJpZGdlKQorICAgICAgICA6IFdlYkNvcmU6OldvcmtlckNvbnRleHQ6Ok9i c2VydmVyKGNvbnRleHQpCisgICAgICAgICwgbV9icmlkZ2UoYnJpZGdlKQorICAgIHsKKyAgICB9 CisKKyAgICAvLyBBbHRob3VnaCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlIG1hbmFn ZXMgdGhlIGxpZmV0aW1lIG9mIHRoaXMgY2xhc3MsCisgICAgLy8gc28gV29ya2VyRmlsZVN5c3Rl bUNhbGxiYWNrc0JyaWRnZSB3aWxsIGJlIHZhbGlkIHdoaWxlIHRoaXMgY2xhc3MgaXMgYXJvdW5k LgorICAgIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UqIG1fYnJpZGdlOworfTsKKwog dm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpzdG9wKCkKIHsKICAgICBBU1NF UlQobV93b3JrZXJDb250ZXh0LT5pc0NvbnRleHRUaHJlYWQoKSk7Ci0gICAgTXV0ZXhMb2NrZXIg bG9ja2VyKG1fbXV0ZXgpOwotICAgIG1fd29ya2VyTG9hZGVyUHJveHkgPSAwOworICAgIHsKKyAg ICAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fbG9hZGVyUHJveHlNdXRleCk7CisgICAgICAgIG1f d29ya2VyTG9hZGVyUHJveHkgPSAwOworICAgIH0KIAotICAgIGlmIChtX2NhbGxiYWNrc09uV29y a2VyVGhyZWFkKSB7CisgICAgaWYgKG1fY2FsbGJhY2tzT25Xb3JrZXJUaHJlYWQpCiAgICAgICAg IG1fY2FsbGJhY2tzT25Xb3JrZXJUaHJlYWQtPmRpZEZhaWwoV2ViRmlsZUVycm9yQWJvcnQpOwot ICAgICAgICBtX2NhbGxiYWNrc09uV29ya2VyVGhyZWFkID0gMDsKKworICAgIGNsZWFuVXBBZnRl ckNhbGxiYWNrKCk7Cit9CisKK3ZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6 Y2xlYW5VcEFmdGVyQ2FsbGJhY2soKQoreworICAgIEFTU0VSVChtX3dvcmtlckNvbnRleHQtPmlz Q29udGV4dFRocmVhZCgpKTsKKworICAgIG1fY2FsbGJhY2tzT25Xb3JrZXJUaHJlYWQgPSAwOwor ICAgIGlmIChtX3dvcmtlckNvbnRleHRPYnNlcnZlcikgeworICAgICAgICBkZWxldGUgbV93b3Jr ZXJDb250ZXh0T2JzZXJ2ZXI7CisgICAgICAgIG1fd29ya2VyQ29udGV4dE9ic2VydmVyID0gMDsK ICAgICB9CiB9CiAKQEAgLTMzOSw5ICszNzksOSBAQCB2b2lkIFdvcmtlckZpbGVTeXN0ZW1DYWxs YmFja3NCcmlkZ2U6OmRpZFJlYWREaXJlY3RvcnlPbk1haW5UaHJlYWQoY29uc3QgV2ViVmVjdAog fQogCiBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpXb3JrZXJGaWxlU3lzdGVtQ2Fs bGJhY2tzQnJpZGdlKFdlYkNvcmU6OldvcmtlckxvYWRlclByb3h5KiB3b3JrZXJMb2FkZXJQcm94 eSwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgV2ViRmls ZVN5c3RlbUNhbGxiYWNrcyogY2FsbGJhY2tzKQotICAgIDogV29ya2VyQ29udGV4dDo6T2JzZXJ2 ZXIoc3RhdGljX2Nhc3Q8V29ya2VyQ29udGV4dCo+KHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQpKQot ICAgICwgbV93b3JrZXJMb2FkZXJQcm94eSh3b3JrZXJMb2FkZXJQcm94eSkKKyAgICA6IG1fd29y a2VyTG9hZGVyUHJveHkod29ya2VyTG9hZGVyUHJveHkpCiAgICAgLCBtX3dvcmtlckNvbnRleHQo c2NyaXB0RXhlY3V0aW9uQ29udGV4dCkKKyAgICAsIG1fd29ya2VyQ29udGV4dE9ic2VydmVyKFdv cmtlckZpbGVTeXN0ZW1Db250ZXh0T2JzZXJ2ZXI6OmNyZWF0ZShzdGF0aWNfY2FzdDxXb3JrZXJD b250ZXh0Kj4obV93b3JrZXJDb250ZXh0KSwgdGhpcykubGVha1B0cigpKQogICAgICwgbV9jYWxs YmFja3NPbldvcmtlclRocmVhZChjYWxsYmFja3MpCiB7CiAgICAgQVNTRVJUKG1fd29ya2VyQ29u dGV4dC0+aXNDb250ZXh0VGhyZWFkKCkpOwpAQCAtMzk0LDggKzQzNCwxMSBAQCB2b2lkIFdvcmtl ckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OnJ1blRhc2tPbldvcmtlclRocmVhZChXZWJDb3Jl OjpTY3JpcHRFeGVjdQogICAgICAgICByZXR1cm47CiAgICAgQVNTRVJUKGJyaWRnZS0+bV93b3Jr ZXJDb250ZXh0LT5pc0NvbnRleHRUaHJlYWQoKSk7CiAgICAgdGFza1RvUnVuLT5wZXJmb3JtVGFz ayhzY3JpcHRFeGVjdXRpb25Db250ZXh0KTsKLSAgICBicmlkZ2UtPm1fY2FsbGJhY2tzT25Xb3Jr ZXJUaHJlYWQgPSAwOwotICAgIGJyaWRnZS0+c3RvcE9ic2VydmluZygpOworCisgICAgLy8gdGFz a1RvUnVuIGRvZXMgdGhlIGNhbGxiYWNrLgorICAgIGJyaWRnZS0+Y2xlYW5VcEFmdGVyQ2FsbGJh Y2soKTsKKworICAgIC8vIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UgbWF5IGJlIGRl bGV0ZWQgaGVyZSB3aGVuIGJyaWRnZSBnb2VzIG91dCBvZiBzY29wZS4KIH0KIAogdm9pZCBXb3Jr ZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpkaXNwYXRjaFRhc2tUb01haW5UaHJlYWQoUGFz c093blB0cjxXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpUYXNrPiB0YXNrKQpAQCAt NDEzLDkgKzQ1NiwxMSBAQCB2b2lkIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6Om1h eVBvc3RUYXNrVG9Xb3JrZXIoUGFzc093blB0cjxTY3JpcHRFeGVjdQogICAgIC8vIGluIHRoZSBk ZXN0cnVjdGlvbiBvZiBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlLCB0aGUgb3JkZXJp bmcgb2YgdGhlIFJlZlB0ciBhbmQgdGhlIE11dGV4TG9ja2VyCiAgICAgLy8gaXMgdmVyeSBpbXBv cnRhbnQsIHRvIGVuc3VyZSB0aGF0IHRoZSBtX211dGV4IGlzIHN0aWxsIHZhbGlkIHdoZW4gaXQg Z2V0cyB1bmxvY2tlZC4pCiAgICAgUmVmUHRyPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlk Z2U+IGJyaWRnZSA9IGFkb3B0UmVmKHRoaXMpOwotICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX211 dGV4KTsKKyAgICBNdXRleExvY2tlciBsb2NrZXIobV9sb2FkZXJQcm94eU11dGV4KTsKICAgICBp ZiAobV93b3JrZXJMb2FkZXJQcm94eSkKICAgICAgICAgbV93b3JrZXJMb2FkZXJQcm94eS0+cG9z dFRhc2tGb3JNb2RlVG9Xb3JrZXJDb250ZXh0KGNyZWF0ZUNhbGxiYWNrVGFzaygmcnVuVGFza09u V29ya2VyVGhyZWFkLCBicmlkZ2UsIHRhc2spLCBtb2RlKTsKKworICAgIC8vIFdvcmtlckZpbGVT eXN0ZW1DYWxsYmFja3NCcmlkZ2UgbWF5IGJlIGRlbGV0ZWQgaGVyZSB3aGVuIGJyaWRnZSBnb2Vz IG91dCBvZiBzY29wZS4KIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRn ZS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNr c0JyaWRnZS5oCmluZGV4IDljNDRjYjFhOTc2ZThkNjUyZTA2MDRmYzYxZTcwYTkyZTNhMmVkZTku LmExNzI1ZDA3YmY1NDg0N2FkNWQzMmI2YzZlNjZiZDRiNzA2YWMzZTAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2Uu aAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJGaWxlU3lzdGVtQ2FsbGJh Y2tzQnJpZGdlLmgKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEwIEdv b2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAsIDIw MTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucyBhcmUKQEAgLTM4LDcgKzM4LDYgQEAKICNpbmNsdWRlICJXZWJGaWxlRXJyb3Iu aCIKICNpbmNsdWRlICJwbGF0Zm9ybS9XZWJGaWxlU3lzdGVtLmgiCiAjaW5jbHVkZSAicGxhdGZv cm0vV2ViVmVjdG9yLmgiCi0jaW5jbHVkZSAiV29ya2VyQ29udGV4dC5oIgogI2luY2x1ZGUgPHd0 Zi9QYXNzT3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KICNpbmNsdWRlIDx3 dGYvVGhyZWFkaW5nLmg+CkBAIC01NCwxMCArNTMsMTEgQEAgY2xhc3MgTWFpblRocmVhZEZpbGVT eXN0ZW1DYWxsYmFja3M7CiBjbGFzcyBXZWJDb21tb25Xb3JrZXJDbGllbnQ7CiBjbGFzcyBUaHJl YWRhYmxlQ2FsbGJhY2tzQnJpZGdlV3JhcHBlcjsKIGNsYXNzIFdlYkZpbGVTeXN0ZW1DYWxsYmFj a3M7CitjbGFzcyBXb3JrZXJGaWxlU3lzdGVtQ29udGV4dE9ic2VydmVyOwogc3RydWN0IFdlYkZp bGVJbmZvOwogc3RydWN0IFdlYkZpbGVTeXN0ZW1FbnRyeTsKIAotLy8gVGhpcyBjbGFzcyBpcyB1 c2VkIHRvIHBvc3QgYSBvcGVuRmlsZVN5c3RlbSByZXF1ZXN0IHRvIHRoZSBtYWluIHRocmVhZCBh bmQgZ2V0IGNhbGxlZCBiYWNrIGZvciB0aGUgcmVxdWVzdC4gVGhpcyBtdXN0IGJlIGRlc3RydWN0 ZWQgb24gdGhlIHdvcmtlciB0aHJlYWQuCisvLyBVc2VkIHRvIHBvc3QgYSBvcGVuRmlsZVN5c3Rl bSByZXF1ZXN0IHRvIHRoZSBtYWluIHRocmVhZCBhbmQgZ2V0IGNhbGxlZCBiYWNrIGZvciB0aGUg cmVxdWVzdC4KIC8vCiAvLyBBIHR5cGljYWwgZmxvdyBmb3Igb3BlbkZpbGVTeXN0ZW0gd291bGQg bG9vayBsaWtlIHRoaXM6CiAvLyBCcmlkZ2U6OnBvc3RPcGVuRmlsZVN5c3RlbVRvTWFpblRocmVh ZCgpIG9uIFdvcmtlclRocmVhZApAQCAtNjksMTYgKzY5LDggQEAgc3RydWN0IFdlYkZpbGVTeXN0 ZW1FbnRyeTsKIC8vICAtLT4gQnJpZGdlOjpkaWRYeHhPbldvcmtlclRocmVhZCBpcyBjYWxsZWQg b24gV29ya2VyVGhyZWFkCiAvLyAgICAgIFRoaXMgY2FsbHMgdGhlIG9yaWdpbmFsIGNhbGxiYWNr cyAobV9jYWxsYmFja3NPbldvcmtlclRocmVhZCkgYW5kCiAvLyAgICAgIHJlbGVhc2VzIGEgc2Vs Zi1yZWZlcmVuY2UgdG8gdGhlIGJyaWRnZS4KLWNsYXNzIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFj a3NCcmlkZ2UgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8V29ya2VyRmlsZVN5c3RlbUNh bGxiYWNrc0JyaWRnZT4sIHB1YmxpYyBXZWJDb3JlOjpXb3JrZXJDb250ZXh0OjpPYnNlcnZlciB7 CitjbGFzcyBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlIDogcHVibGljIFRocmVhZFNh ZmVSZWZDb3VudGVkPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U+IHsKIHB1YmxpYzoK LSAgICB+V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSgpOwotCi0gICAgLy8gV29ya2Vy Q29udGV4dDo6T2JzZXJ2ZXIgbWV0aG9kLgotICAgIHZpcnR1YWwgdm9pZCBub3RpZnlTdG9wKCkK LSAgICB7Ci0gICAgICAgIHN0b3AoKTsKLSAgICB9Ci0KICAgICB2b2lkIHN0b3AoKTsKIAogICAg IHN0YXRpYyBQYXNzUmVmUHRyPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U+IGNyZWF0 ZShXZWJDb3JlOjpXb3JrZXJMb2FkZXJQcm94eSogd29ya2VyTG9hZGVyUHJveHksIFdlYkNvcmU6 OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIHdvcmtlckNvbnRleHQsIFdlYkZpbGVTeXN0ZW1DYWxs YmFja3MqIGNhbGxiYWNrcykKQEAgLTEwNyw3ICs5OSwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBk aWRSZWFkRGlyZWN0b3J5T25NYWluVGhyZWFkKGNvbnN0IFdlYlZlY3RvcjxXZWJGaWxlU3lzdGVt RW50cnk+JiwgYm9vbCBoYXNNb3JlLCBjb25zdCBTdHJpbmcmIG1vZGUpOwogCiBwcml2YXRlOgor ICAgIGZyaWVuZCBjbGFzcyBUaHJlYWRTYWZlUmVmQ291bnRlZDxXb3JrZXJGaWxlU3lzdGVtQ2Fs bGJhY2tzQnJpZGdlPjsKKwogICAgIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UoV2Vi Q29yZTo6V29ya2VyTG9hZGVyUHJveHkqLCBXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiwgV2ViRmlsZVN5c3RlbUNhbGxiYWNrcyopOworICAgIH5Xb3JrZXJGaWxlU3lzdGVtQ2FsbGJh Y2tzQnJpZGdlKCk7CiAKICAgICAvLyBNZXRob2RzIHRoYXQgYXJlIHRvIGJlIGNhbGxlZCBvbiB0 aGUgbWFpbiB0aHJlYWQuCiAgICAgc3RhdGljIHZvaWQgb3BlbkZpbGVTeXN0ZW1Pbk1haW5UaHJl YWQoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdlYkNvbW1vbldvcmtlckNsaWVu dCosIFdlYkZpbGVTeXN0ZW06OlR5cGUsIGxvbmcgbG9uZyBzaXplLCBib29sIGNyZWF0ZSwgV29y a2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSosIGNvbnN0IFN0cmluZyYgbW9kZSk7CkBAIC0x MzcsMTAgKzEzMiwxNiBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlzcGF0Y2hUYXNrVG9NYWluVGhy ZWFkKFBhc3NPd25QdHI8V2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6VGFzaz4pOwog ICAgIHZvaWQgbWF5UG9zdFRhc2tUb1dvcmtlcihQYXNzT3duUHRyPFdlYkNvcmU6OlNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQ6OlRhc2s+LCBjb25zdCBTdHJpbmcmIG1vZGUpOwogCi0gICAgTXV0ZXgg bV9tdXRleDsKKyAgICB2b2lkIGNsZWFuVXBBZnRlckNhbGxiYWNrKCk7CisKKyAgICBNdXRleCBt X2xvYWRlclByb3h5TXV0ZXg7CiAgICAgV2ViQ29yZTo6V29ya2VyTG9hZGVyUHJveHkqIG1fd29y a2VyTG9hZGVyUHJveHk7CisKICAgICBXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBt X3dvcmtlckNvbnRleHQ7CiAKKyAgICAvLyBNdXN0IGJlIGRlbGV0ZWQgb24gdGhlIFdvcmtlckNv bnRleHQgdGhyZWFkLgorICAgIFdvcmtlckZpbGVTeXN0ZW1Db250ZXh0T2JzZXJ2ZXIqIG1fd29y a2VyQ29udGV4dE9ic2VydmVyOworCiAgICAgLy8gVGhpcyBpcyBzZWxmLWRlc3RydWN0ZWQgYW5k IG11c3QgYmUgZmlyZWQgb24gdGhlIHdvcmtlciB0aHJlYWQuCiAgICAgV2ViRmlsZVN5c3RlbUNh bGxiYWNrcyogbV9jYWxsYmFja3NPbldvcmtlclRocmVhZDsKIH07Cg== 121156 2012-01-04 14:28:27 -0800 2012-01-04 14:40:59 -0800 Patch bug-75573-20120104142825.patch text/plain 9929 levin U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDA5ZGQyZTY2MzU2ZWI0NzAyZTUzMGU2ZTViZTMxMjllMjc3YWQ0NDAuLjljZGRmYWNjOWVlOTY3 MWVlMjk0ZmQ2NzNjMDUyYWFmOTIyNDEzZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTItMDEtMDQgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gTWFrZSBpdCBzYWZlIHRvIGRlbGV0ZSBXb3JrZXJG aWxlU3lzdGVtQ29udGV4dE9ic2VydmVyIG9uIGFueSB0aHJlYWQuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTU3MworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3JjL1dvcmtlckZpbGVTeXN0ZW1DYWxs YmFja3NCcmlkZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlU3lzdGVtQ29udGV4 dE9ic2VydmVyKTogTW92ZSB0aGUgV29ya2VyQ29udGV4dE9ic2VydmVyCisgICAgICAgIG91dCBv ZiB0aGUgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSBzaW5jZSBhbiBvYnNlcnZlciBz aG91bGQgYmUKKyAgICAgICAgZGVzdHJveWVkIG9uIHRoZSBXb3JrZXJDb250ZXh0IHRocmVhZC4g KEFjdHVhbGx5LCBpdCBjb3VsZCBiZSBkZXN0cm95ZWQgb24gZWl0aGVyCisgICAgICAgIHRocmVh ZCBpZiB5b3UgYXJlIGNhcmVmdWwgdG8gbWFrZSBhIGNlcnRhaW4gbWV0aG9kIGNhbGwgb24gaXQg d2hpbGUgb24gdGhlIFdvcmtlckNvbnRleHQKKyAgICAgICAgdGhyZWFkIGJ1dCB0cnlpbmcgdGhh dCBpcyBhIG1vcmUgZnJhZ2lsZSBwYXR0ZXJuLikKKyAgICAgICAgKFdlYktpdDo6V29ya2VyRmls ZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSk6 CisgICAgICAgIChXZWJLaXQ6OldvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OnN0b3Ap OiBGYWN0b3Igb3V0IHRoZSBjbGVhbiB1cCBhbmQgbWFrZSBpdAorICAgICAgICBjbGVhciB3aGF0 IHRoZSBtdXRleCBpcyBndWFyZGluZy4KKyAgICAgICAgKFdlYktpdDo6V29ya2VyRmlsZVN5c3Rl bUNhbGxiYWNrc0JyaWRnZTo6Y2xlYW5VcEFmdGVyQ2FsbGJhY2spOiBEZWxldGUKKyAgICAgICAg dGhlIG9ic2VydmVyLiBEdWUgdG8gd2hlcmUgdGhpcyBpcyBjYWxsZWQgZnJvbSwgaXQgaXMgYWx3 YXlzIGNhbGxlZCBvbiB0aGUgV29ya2VyQ29udGV4dCB0aHJlYWQuCisgICAgICAgIChXZWJLaXQ6 OldvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OnJ1blRhc2tPbldvcmtlclRocmVhZCk6 IFJlcGxhY2Ugc29tZSBjb2RlIHdpdGgKKyAgICAgICAgdGhlIGNsZWFuVXBBZnRlckNhbGxiYWNr IGNhbGwuCisgICAgICAgIChXZWJLaXQ6OldvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6 Om1heVBvc3RUYXNrVG9Xb3JrZXIpOgorICAgICAgICAqIHNyYy9Xb3JrZXJGaWxlU3lzdGVtQ2Fs bGJhY2tzQnJpZGdlLmg6IEluIGFkZGl0aW9uIHRvIHNvbWUgY29tbWVudCBjbGVhbiB1cHMgYW5k IGNvZGUgZmFjdG9yaW5nLAorICAgICAgICBJIG1hZGUgdGhlIGRlc2N0cnVjdG9yIHByaXZhdGUg c2luY2Ugbm8gb25lIHNob3VsZCBjYWxsIGl0IGRpcmVjdGx5LgorCiAyMDEyLTAxLTA0ICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CiAKICAgICAgICAgW2Nocm9taXVtXSBDcmVh dGUgdW5pdCB0ZXN0cyBmb3IgQ0NUaWxlZExheWVySW1wbApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZS5jcHAgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdl LmNwcAppbmRleCA4Y2U1ZTY5NzZiYjA5MTkzZDNhNzQwOWE1YTFjZjc4ZmM0YzA1NTcxLi4zMDVl ZWRiZDk1MTg1OTNhOGZmYmM2MTk4ZGY5OTBjMjlkY2QxNGM4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tz QnJpZGdlLmNwcApAQCAtMTQ0LDE1ICsxNDQsNTUgQEAgcHJpdmF0ZToKICAgICBjb25zdCBTdHJp bmcgbV9tb2RlOwogfTsKIAorLy8gT2JzZXJ2ZXMgdGhlIHdvcmtlciBjb250ZXh0LiBCeSBrZWVw aW5nIHRoaXMgc2VwYXJhdGUsIGl0IGlzIGVhc2llciB0byB2ZXJpZnkKKy8vIHRoYXQgaXQgb25s eSBnZXRzIGRlbGV0ZWQgb24gdGhlIHdvcmtlciBjb250ZXh0IHRocmVhZCB3aGljaCBpcyB2ZXJp ZmllZCBieSB+T2JzZXJ2ZXIuCitjbGFzcyBXb3JrZXJGaWxlU3lzdGVtQ29udGV4dE9ic2VydmVy IDogcHVibGljIFdlYkNvcmU6OldvcmtlckNvbnRleHQ6Ok9ic2VydmVyIHsKK3B1YmxpYzoKKyAg ICBzdGF0aWMgUGFzc093blB0cjxXb3JrZXJGaWxlU3lzdGVtQ29udGV4dE9ic2VydmVyPiBjcmVh dGUoV29ya2VyQ29udGV4dCogY29udGV4dCwgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRn ZSogYnJpZGdlKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBXb3JrZXJGaWxl U3lzdGVtQ29udGV4dE9ic2VydmVyKGNvbnRleHQsIGJyaWRnZSkpOworICAgIH0KKworICAgIC8v IFdvcmtlckNvbnRleHQ6Ok9ic2VydmVyIG1ldGhvZC4KKyAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5 U3RvcCgpCisgICAgeworICAgICAgICBtX2JyaWRnZS0+c3RvcCgpOworICAgIH0KKworcHJpdmF0 ZToKKyAgICBXb3JrZXJGaWxlU3lzdGVtQ29udGV4dE9ic2VydmVyKFdvcmtlckNvbnRleHQqIGNv bnRleHQsIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UqIGJyaWRnZSkKKyAgICAgICAg OiBXZWJDb3JlOjpXb3JrZXJDb250ZXh0OjpPYnNlcnZlcihjb250ZXh0KQorICAgICAgICAsIG1f YnJpZGdlKGJyaWRnZSkKKyAgICB7CisgICAgfQorCisgICAgLy8gQWx0aG91Z2ggV29ya2VyRmls ZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSBtYW5hZ2VzIHRoZSBsaWZldGltZSBvZiB0aGlzIGNsYXNz LAorICAgIC8vIHNvIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2Ugd2lsbCBiZSB2YWxp ZCB3aGlsZSB0aGlzIGNsYXNzIGlzIGFyb3VuZC4KKyAgICBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJh Y2tzQnJpZGdlKiBtX2JyaWRnZTsKK307CisKIHZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNr c0JyaWRnZTo6c3RvcCgpCiB7CiAgICAgQVNTRVJUKG1fd29ya2VyQ29udGV4dC0+aXNDb250ZXh0 VGhyZWFkKCkpOwotICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX211dGV4KTsKLSAgICBtX3dvcmtl ckxvYWRlclByb3h5ID0gMDsKKyAgICB7CisgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX2xv YWRlclByb3h5TXV0ZXgpOworICAgICAgICBtX3dvcmtlckxvYWRlclByb3h5ID0gMDsKKyAgICB9 CiAKLSAgICBpZiAobV9jYWxsYmFja3NPbldvcmtlclRocmVhZCkgeworICAgIGlmIChtX2NhbGxi YWNrc09uV29ya2VyVGhyZWFkKQogICAgICAgICBtX2NhbGxiYWNrc09uV29ya2VyVGhyZWFkLT5k aWRGYWlsKFdlYkZpbGVFcnJvckFib3J0KTsKLSAgICAgICAgbV9jYWxsYmFja3NPbldvcmtlclRo cmVhZCA9IDA7CisKKyAgICBjbGVhblVwQWZ0ZXJDYWxsYmFjaygpOworfQorCit2b2lkIFdvcmtl ckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U6OmNsZWFuVXBBZnRlckNhbGxiYWNrKCkKK3sKKyAg ICBBU1NFUlQobV93b3JrZXJDb250ZXh0LT5pc0NvbnRleHRUaHJlYWQoKSk7CisKKyAgICBtX2Nh bGxiYWNrc09uV29ya2VyVGhyZWFkID0gMDsKKyAgICBpZiAobV93b3JrZXJDb250ZXh0T2JzZXJ2 ZXIpIHsKKyAgICAgICAgZGVsZXRlIG1fd29ya2VyQ29udGV4dE9ic2VydmVyOworICAgICAgICBt X3dvcmtlckNvbnRleHRPYnNlcnZlciA9IDA7CiAgICAgfQogfQogCkBAIC0zMzksOSArMzc5LDkg QEAgdm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpkaWRSZWFkRGlyZWN0b3J5 T25NYWluVGhyZWFkKGNvbnN0IFdlYlZlY3QKIH0KIAogV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNr c0JyaWRnZTo6V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZShXZWJDb3JlOjpXb3JrZXJM b2FkZXJQcm94eSogd29ya2VyTG9hZGVyUHJveHksIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIHNj cmlwdEV4ZWN1dGlvbkNvbnRleHQsIFdlYkZpbGVTeXN0ZW1DYWxsYmFja3MqIGNhbGxiYWNrcykK LSAgICA6IFdvcmtlckNvbnRleHQ6Ok9ic2VydmVyKHN0YXRpY19jYXN0PFdvcmtlckNvbnRleHQq PihzY3JpcHRFeGVjdXRpb25Db250ZXh0KSkKLSAgICAsIG1fd29ya2VyTG9hZGVyUHJveHkod29y a2VyTG9hZGVyUHJveHkpCisgICAgOiBtX3dvcmtlckxvYWRlclByb3h5KHdvcmtlckxvYWRlclBy b3h5KQogICAgICwgbV93b3JrZXJDb250ZXh0KHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQpCisgICAg LCBtX3dvcmtlckNvbnRleHRPYnNlcnZlcihXb3JrZXJGaWxlU3lzdGVtQ29udGV4dE9ic2VydmVy OjpjcmVhdGUoc3RhdGljX2Nhc3Q8V29ya2VyQ29udGV4dCo+KG1fd29ya2VyQ29udGV4dCksIHRo aXMpLmxlYWtQdHIoKSkKICAgICAsIG1fY2FsbGJhY2tzT25Xb3JrZXJUaHJlYWQoY2FsbGJhY2tz KQogewogICAgIEFTU0VSVChtX3dvcmtlckNvbnRleHQtPmlzQ29udGV4dFRocmVhZCgpKTsKQEAg LTM5NCw4ICs0MzQsMTEgQEAgdm9pZCBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjpy dW5UYXNrT25Xb3JrZXJUaHJlYWQoV2ViQ29yZTo6U2NyaXB0RXhlY3UKICAgICAgICAgcmV0dXJu OwogICAgIEFTU0VSVChicmlkZ2UtPm1fd29ya2VyQ29udGV4dC0+aXNDb250ZXh0VGhyZWFkKCkp OwogICAgIHRhc2tUb1J1bi0+cGVyZm9ybVRhc2soc2NyaXB0RXhlY3V0aW9uQ29udGV4dCk7Ci0g ICAgYnJpZGdlLT5tX2NhbGxiYWNrc09uV29ya2VyVGhyZWFkID0gMDsKLSAgICBicmlkZ2UtPnN0 b3BPYnNlcnZpbmcoKTsKKworICAgIC8vIHRhc2tUb1J1biBkb2VzIHRoZSBjYWxsYmFjay4KKyAg ICBicmlkZ2UtPmNsZWFuVXBBZnRlckNhbGxiYWNrKCk7CisKKyAgICAvLyBXb3JrZXJGaWxlU3lz dGVtQ2FsbGJhY2tzQnJpZGdlIG1heSBiZSBkZWxldGVkIGhlcmUgd2hlbiBicmlkZ2UgZ29lcyBv dXQgb2Ygc2NvcGUuCiB9CiAKIHZvaWQgV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZTo6 ZGlzcGF0Y2hUYXNrVG9NYWluVGhyZWFkKFBhc3NPd25QdHI8V2ViQ29yZTo6U2NyaXB0RXhlY3V0 aW9uQ29udGV4dDo6VGFzaz4gdGFzaykKQEAgLTQxMyw5ICs0NTYsMTEgQEAgdm9pZCBXb3JrZXJG aWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlOjptYXlQb3N0VGFza1RvV29ya2VyKFBhc3NPd25QdHI8 U2NyaXB0RXhlY3UKICAgICAvLyBpbiB0aGUgZGVzdHJ1Y3Rpb24gb2YgV29ya2VyRmlsZVN5c3Rl bUNhbGxiYWNrc0JyaWRnZSwgdGhlIG9yZGVyaW5nIG9mIHRoZSBSZWZQdHIgYW5kIHRoZSBNdXRl eExvY2tlcgogICAgIC8vIGlzIHZlcnkgaW1wb3J0YW50LCB0byBlbnN1cmUgdGhhdCB0aGUgbV9t dXRleCBpcyBzdGlsbCB2YWxpZCB3aGVuIGl0IGdldHMgdW5sb2NrZWQuKQogICAgIFJlZlB0cjxX b3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiBicmlkZ2UgPSBhZG9wdFJlZih0aGlzKTsK LSAgICBNdXRleExvY2tlciBsb2NrZXIobV9tdXRleCk7CisgICAgTXV0ZXhMb2NrZXIgbG9ja2Vy KG1fbG9hZGVyUHJveHlNdXRleCk7CiAgICAgaWYgKG1fd29ya2VyTG9hZGVyUHJveHkpCiAgICAg ICAgIG1fd29ya2VyTG9hZGVyUHJveHktPnBvc3RUYXNrRm9yTW9kZVRvV29ya2VyQ29udGV4dChj cmVhdGVDYWxsYmFja1Rhc2soJnJ1blRhc2tPbldvcmtlclRocmVhZCwgYnJpZGdlLCB0YXNrKSwg bW9kZSk7CisKKyAgICAvLyBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlIG1heSBiZSBk ZWxldGVkIGhlcmUgd2hlbiBicmlkZ2UgZ29lcyBvdXQgb2Ygc2NvcGUuCiB9CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dv cmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2UuaAppbmRleCA5YzQ0Y2IxYTk3NmU4 ZDY1MmUwNjA0ZmM2MWU3MGE5MmUzYTJlZGU5Li5hMTcyNWQwN2JmNTQ4NDdhZDVkMzJiNmM2ZTY2 YmQ0YjcwNmFjM2UwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Xb3Jr ZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZS5oCkBAIC0xLDUgKzEsNSBAQAog LyoKLSAqIENvcHlyaWdodCAoQykgMjAxMCBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorICogQ29weXJpZ2h0IChDKSAyMDEwLCAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC0zOCw3ICszOCw2 IEBACiAjaW5jbHVkZSAiV2ViRmlsZUVycm9yLmgiCiAjaW5jbHVkZSAicGxhdGZvcm0vV2ViRmls ZVN5c3RlbS5oIgogI2luY2x1ZGUgInBsYXRmb3JtL1dlYlZlY3Rvci5oIgotI2luY2x1ZGUgIldv cmtlckNvbnRleHQuaCIKICNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgogI2luY2x1ZGUgPHd0 Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1RocmVhZGluZy5oPgpAQCAtNTQsMTAgKzUz LDExIEBAIGNsYXNzIE1haW5UaHJlYWRGaWxlU3lzdGVtQ2FsbGJhY2tzOwogY2xhc3MgV2ViQ29t bW9uV29ya2VyQ2xpZW50OwogY2xhc3MgVGhyZWFkYWJsZUNhbGxiYWNrc0JyaWRnZVdyYXBwZXI7 CiBjbGFzcyBXZWJGaWxlU3lzdGVtQ2FsbGJhY2tzOworY2xhc3MgV29ya2VyRmlsZVN5c3RlbUNv bnRleHRPYnNlcnZlcjsKIHN0cnVjdCBXZWJGaWxlSW5mbzsKIHN0cnVjdCBXZWJGaWxlU3lzdGVt RW50cnk7CiAKLS8vIFRoaXMgY2xhc3MgaXMgdXNlZCB0byBwb3N0IGEgb3BlbkZpbGVTeXN0ZW0g cmVxdWVzdCB0byB0aGUgbWFpbiB0aHJlYWQgYW5kIGdldCBjYWxsZWQgYmFjayBmb3IgdGhlIHJl cXVlc3QuIFRoaXMgbXVzdCBiZSBkZXN0cnVjdGVkIG9uIHRoZSB3b3JrZXIgdGhyZWFkLgorLy8g VXNlZCB0byBwb3N0IGEgb3BlbkZpbGVTeXN0ZW0gcmVxdWVzdCB0byB0aGUgbWFpbiB0aHJlYWQg YW5kIGdldCBjYWxsZWQgYmFjayBmb3IgdGhlIHJlcXVlc3QuCiAvLwogLy8gQSB0eXBpY2FsIGZs b3cgZm9yIG9wZW5GaWxlU3lzdGVtIHdvdWxkIGxvb2sgbGlrZSB0aGlzOgogLy8gQnJpZGdlOjpw b3N0T3BlbkZpbGVTeXN0ZW1Ub01haW5UaHJlYWQoKSBvbiBXb3JrZXJUaHJlYWQKQEAgLTY5LDE2 ICs2OSw4IEBAIHN0cnVjdCBXZWJGaWxlU3lzdGVtRW50cnk7CiAvLyAgLS0+IEJyaWRnZTo6ZGlk WHh4T25Xb3JrZXJUaHJlYWQgaXMgY2FsbGVkIG9uIFdvcmtlclRocmVhZAogLy8gICAgICBUaGlz IGNhbGxzIHRoZSBvcmlnaW5hbCBjYWxsYmFja3MgKG1fY2FsbGJhY2tzT25Xb3JrZXJUaHJlYWQp IGFuZAogLy8gICAgICByZWxlYXNlcyBhIHNlbGYtcmVmZXJlbmNlIHRvIHRoZSBicmlkZ2UuCi1j bGFzcyBXb3JrZXJGaWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlIDogcHVibGljIFRocmVhZFNhZmVS ZWZDb3VudGVkPFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2U+LCBwdWJsaWMgV2ViQ29y ZTo6V29ya2VyQ29udGV4dDo6T2JzZXJ2ZXIgeworY2xhc3MgV29ya2VyRmlsZVN5c3RlbUNhbGxi YWNrc0JyaWRnZSA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxXb3JrZXJGaWxlU3lzdGVt Q2FsbGJhY2tzQnJpZGdlPiB7CiBwdWJsaWM6Ci0gICAgfldvcmtlckZpbGVTeXN0ZW1DYWxsYmFj a3NCcmlkZ2UoKTsKLQotICAgIC8vIFdvcmtlckNvbnRleHQ6Ok9ic2VydmVyIG1ldGhvZC4KLSAg ICB2aXJ0dWFsIHZvaWQgbm90aWZ5U3RvcCgpCi0gICAgewotICAgICAgICBzdG9wKCk7Ci0gICAg fQotCiAgICAgdm9pZCBzdG9wKCk7CiAKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxXb3JrZXJGaWxl U3lzdGVtQ2FsbGJhY2tzQnJpZGdlPiBjcmVhdGUoV2ViQ29yZTo6V29ya2VyTG9hZGVyUHJveHkq IHdvcmtlckxvYWRlclByb3h5LCBXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0KiB3b3Jr ZXJDb250ZXh0LCBXZWJGaWxlU3lzdGVtQ2FsbGJhY2tzKiBjYWxsYmFja3MpCkBAIC0xMDcsNyAr OTksMTAgQEAgcHVibGljOgogICAgIHZvaWQgZGlkUmVhZERpcmVjdG9yeU9uTWFpblRocmVhZChj b25zdCBXZWJWZWN0b3I8V2ViRmlsZVN5c3RlbUVudHJ5PiYsIGJvb2wgaGFzTW9yZSwgY29uc3Qg U3RyaW5nJiBtb2RlKTsKIAogcHJpdmF0ZToKKyAgICBmcmllbmQgY2xhc3MgVGhyZWFkU2FmZVJl ZkNvdW50ZWQ8V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZT47CisKICAgICBXb3JrZXJG aWxlU3lzdGVtQ2FsbGJhY2tzQnJpZGdlKFdlYkNvcmU6OldvcmtlckxvYWRlclByb3h5KiwgV2Vi Q29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdlYkZpbGVTeXN0ZW1DYWxsYmFja3MqKTsK KyAgICB+V29ya2VyRmlsZVN5c3RlbUNhbGxiYWNrc0JyaWRnZSgpOwogCiAgICAgLy8gTWV0aG9k cyB0aGF0IGFyZSB0byBiZSBjYWxsZWQgb24gdGhlIG1haW4gdGhyZWFkLgogICAgIHN0YXRpYyB2 b2lkIG9wZW5GaWxlU3lzdGVtT25NYWluVGhyZWFkKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNv bnRleHQqLCBXZWJDb21tb25Xb3JrZXJDbGllbnQqLCBXZWJGaWxlU3lzdGVtOjpUeXBlLCBsb25n IGxvbmcgc2l6ZSwgYm9vbCBjcmVhdGUsIFdvcmtlckZpbGVTeXN0ZW1DYWxsYmFja3NCcmlkZ2Uq LCBjb25zdCBTdHJpbmcmIG1vZGUpOwpAQCAtMTM3LDEwICsxMzIsMTYgQEAgcHJpdmF0ZToKICAg ICB2b2lkIGRpc3BhdGNoVGFza1RvTWFpblRocmVhZChQYXNzT3duUHRyPFdlYkNvcmU6OlNjcmlw dEV4ZWN1dGlvbkNvbnRleHQ6OlRhc2s+KTsKICAgICB2b2lkIG1heVBvc3RUYXNrVG9Xb3JrZXIo UGFzc093blB0cjxXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpUYXNrPiwgY29uc3Qg U3RyaW5nJiBtb2RlKTsKIAotICAgIE11dGV4IG1fbXV0ZXg7CisgICAgdm9pZCBjbGVhblVwQWZ0 ZXJDYWxsYmFjaygpOworCisgICAgTXV0ZXggbV9sb2FkZXJQcm94eU11dGV4OwogICAgIFdlYkNv cmU6OldvcmtlckxvYWRlclByb3h5KiBtX3dvcmtlckxvYWRlclByb3h5OworCiAgICAgV2ViQ29y ZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dCogbV93b3JrZXJDb250ZXh0OwogCisgICAgLy8gTXVz dCBiZSBkZWxldGVkIG9uIHRoZSBXb3JrZXJDb250ZXh0IHRocmVhZC4KKyAgICBXb3JrZXJGaWxl U3lzdGVtQ29udGV4dE9ic2VydmVyKiBtX3dvcmtlckNvbnRleHRPYnNlcnZlcjsKKwogICAgIC8v IFRoaXMgaXMgc2VsZi1kZXN0cnVjdGVkIGFuZCBtdXN0IGJlIGZpcmVkIG9uIHRoZSB3b3JrZXIg dGhyZWFkLgogICAgIFdlYkZpbGVTeXN0ZW1DYWxsYmFja3MqIG1fY2FsbGJhY2tzT25Xb3JrZXJU aHJlYWQ7CiB9Owo=