104123 2012-12-05 07:51:31 -0800 [BlackBerry] GeolocationClientBB only holding the latest geolocation permission request 2012-12-05 08:49:19 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 otcheung webkit-unassigned mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 783746 0 otcheung 2012-12-05 07:51:31 -0800 We need to support handling multiple geolocation objects coming from different frames in the same page. 783756 1 177751 otcheung 2012-12-05 08:05:34 -0800 Created attachment 177751 Patch 783761 2 177751 yong.li.webkit 2012-12-05 08:09:59 -0800 Comment on attachment 177751 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177751&action=review > Source/WebKit/blackberry/WebCoreSupport/GeolocationClientBlackBerry.cpp:110 > + ASSERT(it != m_geolocationRequestMap.end()); I still prefer a release build crash... 783765 3 177754 otcheung 2012-12-05 08:16:08 -0800 Created attachment 177754 Patch 783768 4 177754 yong.li.webkit 2012-12-05 08:19:16 -0800 Comment on attachment 177754 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177754&action=review > Source/WebKit/blackberry/WebCoreSupport/GeolocationClientBlackBerry.cpp:112 > + if (it != m_geolocationRequestMap.end()) should be it == 783771 5 177755 otcheung 2012-12-05 08:21:18 -0800 Created attachment 177755 Patch 783772 6 177755 yong.li.webkit 2012-12-05 08:22:50 -0800 Comment on attachment 177755 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177755&action=review > Source/WebKit/blackberry/WebCoreSupport/GeolocationClientBlackBerry.cpp:113 > + ASSERT(it != m_geolocationRequestMap.end()); > + if (it == m_geolocationRequestMap.end()) > + return; I feel much better. Thanks! 783792 7 177755 webkit.review.bot 2012-12-05 08:49:16 -0800 Comment on attachment 177755 Patch Clearing flags on attachment: 177755 Committed r136694: <http://trac.webkit.org/changeset/136694> 783793 8 webkit.review.bot 2012-12-05 08:49:19 -0800 All reviewed patches have been landed. Closing bug. 177751 2012-12-05 08:05:34 -0800 2012-12-05 08:16:04 -0800 Patch bug-104123-20121205110258.patch text/plain 7627 otcheung U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAzMGY3NDM3ODFiOWIzZjg3MTZlNzJjOTdiZThhMjBkZTJiYzhkZWFiLi4yMjZiNzFkZDgz ZWYzY2QwZTA1ZGY1NGQ2Y2Y4OGIyOWVjMDcxMzE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMi0xMi0wNSAgT3R0byBEZXJlayBDaGV1bmcgIDxv dGNoZXVuZ0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBHZW9sb2NhdGlvbkNsaWVu dEJCIG9ubHkgaG9sZGluZyB0aGUgbGF0ZXN0IGdlb2xvY2F0aW9uIHBlcm1pc3Npb24gcmVxdWVz dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0MTIz CisKKyAgICAgICAgUFIgMjU2MDg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIGEgbWFwcGluZyBiZXR3ZWVuIG9yaWdpbiBVUkwgYW5kIGl0J3Mg Z2VvbG9jYXRpb24gb2JqZWN0IHNvIHdlIGNvdWxkCisgICAgICAgIHJlc3BvbmQgdG8gdGhlIGNv cnJlY3QgZ2VvbG9jYXRpb24gd2hlbiBsaWJ3ZWJ2aWV3IHJlc3BvbmRzIHdpdGggb25QZXJtaXNz aW9uCisgICAgICAgIGluIEdlb2xvY2F0aW9uQ2xpZW50LgorCisgICAgICAgIFVzaW5nIHRoZSBt YXBwaW5nLCB3ZSBjb3VsZCBhbHNvIHByZXZlbnQgcmVxdWVzdEdlb2xvY2F0aW9uIHJlcXVlc3Rz IGZyb20gdGhlIHNhbWUgb3JpZ2luCisgICAgICAgIHRvIGJlIHNlbnQgdHdpY2UuIFRoaXMgcHJl dmVudHMgcGFnZXMgdGhhdCBob2xkIHR3byBpZnJhbWVzIHRvIHRoZSBzYW1lIHJlc291cmNlIHRv IHJlcXVlc3QKKyAgICAgICAgZ2VvbG9jYXRpb24gcGVybWlzc2lvbiBvbiB0aGUgc2FtZSBzZWN1 cml0eSBvcmlnaW4gdHdpY2UuCisKKyAgICAgICAgVGVzdGVkIHRoaXMgYnkgcnVubmluZyBhIHBh Z2UgdGhhdCBpbmNsdWRlcyAyIG9yIG1vcmUgaWZyYW1lcyB0aGF0IHJlcXVlc3RzIGdlb2xvY2F0 aW9uCisgICAgICAgIHBlcm1pc3Npb24uCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9HZW9s b2NhdGlvbkNsaWVudEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoR2VvbG9jYXRpb25DbGllbnRC bGFja0JlcnJ5OjpyZXF1ZXN0UGVybWlzc2lvbik6CisgICAgICAgIChHZW9sb2NhdGlvbkNsaWVu dEJsYWNrQmVycnk6OmNhbmNlbFBlcm1pc3Npb25SZXF1ZXN0KToKKyAgICAgICAgKEdlb2xvY2F0 aW9uQ2xpZW50QmxhY2tCZXJyeTo6b25QZXJtaXNzaW9uKToKKyAgICAgICAgKiBXZWJDb3JlU3Vw cG9ydC9HZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnkuaDoKKyAgICAgICAgKEdlb2xvY2F0aW9u Q2xpZW50QmxhY2tCZXJyeSk6CisKIDIwMTItMTItMDIgIFRpYW5jaGVuZyBKaWFuZyAgPHRpamlh bmdAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV1UYXAgaGlnaGxpZ2h0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25D bGllbnRCbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3Vw cG9ydC9HZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnkuY3BwCmluZGV4IDMxZTgzMmY2MzBkOTYw OGY1MjAyYzVhZTJmMzE0YWJmMTk1MjUzZjAuLjg4NTRlNzAwY2JmYTM0MDRjM2RhOTE2MDEwMmQz NmQxOTIxYTljMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3Jl U3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnku Y3BwCkBAIC0zMCwxMyArMzAsNiBAQAogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAotc3Rh dGljIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcgZnJhbWVPcmlnaW4oRnJhbWUq IGZyYW1lKQotewotICAgIERPTVdpbmRvdyogd2luZG93ID0gZnJhbWUtPmRvY3VtZW50KCktPmRv bVdpbmRvdygpOwotICAgIFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4gPSB3aW5kb3ctPmRvY3VtZW50 KCktPnNlY3VyaXR5T3JpZ2luKCk7Ci0gICAgcmV0dXJuIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpT dHJpbmcob3JpZ2luLT50b1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwotfQotCiBHZW9sb2NhdGlv bkNsaWVudEJsYWNrQmVycnk6Okdlb2xvY2F0aW9uQ2xpZW50QmxhY2tCZXJyeShCbGFja0JlcnJ5 OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlKiB3ZWJQYWdlUHJpdmF0ZSkKICAgICA6IG1fd2ViUGFn ZVByaXZhdGUod2ViUGFnZVByaXZhdGUpCiAgICAgLCBtX2FjY3VyYWN5KGZhbHNlKQpAQCAtODAs MTIgKzczLDcgQEAgdm9pZCBHZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnk6OnJlcXVlc3RQZXJt aXNzaW9uKEdlb2xvY2F0aW9uKiBsb2NhdGlvbikKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAot ICAgIERPTVdpbmRvdyogd2luZG93ID0gZnJhbWUtPmRvY3VtZW50KCktPmRvbVdpbmRvdygpOwot ICAgIGlmICghd2luZG93KQotICAgICAgICByZXR1cm47Ci0KLSAgICBjb25zdCBCbGFja0JlcnJ5 OjpQbGF0Zm9ybTo6U3RyaW5nIG9yaWdpbiA9IGZyYW1lT3JpZ2luKGZyYW1lKTsKLSAgICBtX3Bl bmRpbmdQZXJtaXNzaW9uR2VvbG9jYXRpb24gPSBsb2NhdGlvbjsKKyAgICBjb25zdCBTdHJpbmcg b3JpZ2luID0gZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPnRvU3RyaW5nKCk7 CiAKICAgICAvLyBDaGVjayBnbG9iYWwgbG9jYXRpb24gc2V0dGluZywgaWYgaXQgaXMgb2ZmIHRo ZW4gd2UgcmVxdWVzdCBhbiBpbmZvYmFyIHRoYXQgaW52b2tlcyBhIGxvY2F0aW9uIHNldHRpbmdz IGNhcmQuCiAgICAgLy8gSWYgaXQncyBvbiwgdGhlbiB3ZSByZXF1ZXN0IGFuIGluZm9iYXIgdGhh dCBhbGxvd3MgdGhlIHNpdGUgdG8gaGF2ZSBwZXJtaXNzaW9uIHRvIHVzZSBnZW9sb2NhdGlvbi4K QEAgLTk1LDE1ICs4Myw0NSBAQCB2b2lkIEdlb2xvY2F0aW9uQ2xpZW50QmxhY2tCZXJyeTo6cmVx dWVzdFBlcm1pc3Npb24oR2VvbG9jYXRpb24qIGxvY2F0aW9uKQogICAgICAgICAgICAgbV93ZWJQ YWdlUHJpdmF0ZS0+bV9jbGllbnQtPnJlcXVlc3RHbG9iYWxMb2NhbFNlcnZpY2VQZXJtaXNzaW9u KHRoaXMsIG9yaWdpbik7CiAgICAgICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R2VvbG9j YXRpb25IYW5kbGVyOjppbnN0YW5jZSgpLT5zZXRBc2tlZFVzZXJGb3JHbG9iYWxQZXJtaXNzaW9u KCk7CiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgb25QZXJtaXNzaW9uKGZhbHNlKTsKKyAg ICAgICAgICAgIGxvY2F0aW9uLT5zZXRJc0FsbG93ZWQoZmFsc2UpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0gICAgbV93ZWJQYWdlUHJpdmF0ZS0+bV9jbGllbnQtPnJlcXVlc3RHZW9sb2Nh dGlvblBlcm1pc3Npb24odGhpcywgb3JpZ2luKTsKKyAgICAvLyBBZGQgdGhpcyBnZW9sb2NhdGlv biBwZXJtaXNzaW9uIHJlcXVlc3QgdG8gb3VyIHJlcXVlc3QgbWFwLgorICAgIFZlY3RvcjxSZWZQ dHI8R2VvbG9jYXRpb24+ID4gZ2VvUmVxdWVzdHNGb3JPcmlnaW47CisgICAgSGFzaE1hcDxTdHJp bmcsIFZlY3RvcjxSZWZQdHI8R2VvbG9jYXRpb24+ID4gPjo6QWRkUmVzdWx0IHJlc3VsdCA9IG1f Z2VvbG9jYXRpb25SZXF1ZXN0TWFwLmFkZChvcmlnaW4sIGdlb1JlcXVlc3RzRm9yT3JpZ2luKTsK KyAgICByZXN1bHQuaXRlcmF0b3ItPnZhbHVlLmFwcGVuZChsb2NhdGlvbik7CisKKyAgICAvLyBB dm9pZCBzZW5kaW5nIGFub3RoZXIgcmVxdWVzdCBpZiB0aGUgdmVjdG9yIGFscmVhZHkgaGFzIGFu b3RoZXIgZ2VvbG9jYXRpb24gcGVuZGluZyBmb3IgdGhpcyBvcmlnaW4gaW4gdGhpcyBwYWdlLgor ICAgIGlmIChyZXN1bHQuaXNOZXdFbnRyeSkKKyAgICAgICAgbV93ZWJQYWdlUHJpdmF0ZS0+bV9j bGllbnQtPnJlcXVlc3RHZW9sb2NhdGlvblBlcm1pc3Npb24odGhpcywgb3JpZ2luKTsKIH0KIAog dm9pZCBHZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnk6OmNhbmNlbFBlcm1pc3Npb25SZXF1ZXN0 KEdlb2xvY2F0aW9uKiBsb2NhdGlvbikKIHsKKyAgICBGcmFtZSogZnJhbWUgPSBsb2NhdGlvbi0+ ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm47CisKKyAgICBjb25zdCBT dHJpbmcgb3JpZ2luID0gZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPnRvU3Ry aW5nKCk7CisKKyAgICAvLyBSZW1vdmUgdGhlIGdlb2xvY2F0aW9uIGZyb20gdGhlIHBlbmRpbmcg cGVybWlzc2lvbiBtYXAuCisgICAgSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxSZWZQdHI8R2VvbG9j YXRpb24+ID4gPjo6aXRlcmF0b3IgaXQgPSBtX2dlb2xvY2F0aW9uUmVxdWVzdE1hcC5maW5kKG9y aWdpbik7CisgICAgQVNTRVJUKGl0ICE9IG1fZ2VvbG9jYXRpb25SZXF1ZXN0TWFwLmVuZCgpKTsK KworICAgIFZlY3RvcjxSZWZQdHI8R2VvbG9jYXRpb24+ID4qIHJlc3VsdCA9ICYoaXQtPnZhbHVl KTsKKworICAgIHNpemVfdCBnZW9sb2NhdGlvbkNvdW50ID0gcmVzdWx0LT5zaXplKCk7CisgICAg Zm9yIChzaXplX3QgaSA9IDA7IGkgPCBnZW9sb2NhdGlvbkNvdW50OyArK2kpIHsKKyAgICAgICAg aWYgKCgqcmVzdWx0KVtpXS5nZXQoKSA9PSBsb2NhdGlvbikgeworICAgICAgICAgICAgcmVzdWx0 LT5yZW1vdmUoaSk7CisgICAgICAgICAgICAvLyBSZW1vdmUgdGhpcyB2ZWN0b3IgZnJvbSB0aGUg cGVuZGluZyBwZXJtaXNzaW9uIG1hcCBpcyBpdCBkb2Vzbid0IGNvbnRhaW4gYW55bW9yZSBnZW8g b2JqZWN0cworICAgICAgICAgICAgaWYgKHJlc3VsdC0+aXNFbXB0eSgpKQorICAgICAgICAgICAg ICAgIG1fZ2VvbG9jYXRpb25SZXF1ZXN0TWFwLnJlbW92ZShvcmlnaW4pOworICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIH0KKyAgICB9CisKICAgICBtX3dlYlBhZ2VQcml2YXRlLT5tX2NsaWVu dC0+Y2FuY2VsR2VvbG9jYXRpb25QZXJtaXNzaW9uKCk7CiB9CiAKQEAgLTEyMSwxMCArMTM5LDE3 IEBAIHZvaWQgR2VvbG9jYXRpb25DbGllbnRCbGFja0JlcnJ5OjpvbkxvY2F0aW9uRXJyb3IoY29u c3QgY2hhciogZXJyb3JTdHIpCiAgICAgR2VvbG9jYXRpb25Db250cm9sbGVyOjpmcm9tKG1fd2Vi UGFnZVByaXZhdGUtPm1fcGFnZSktPmVycm9yT2NjdXJyZWQoZXJyb3IuZ2V0KCkpOwogfQogCi12 b2lkIEdlb2xvY2F0aW9uQ2xpZW50QmxhY2tCZXJyeTo6b25QZXJtaXNzaW9uKGJvb2wgaXNBbGxv d2VkKQordm9pZCBHZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnk6Om9uUGVybWlzc2lvbihjb25z dCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiBvcmlnaW4sIGJvb2wgaXNBbGxvd2VkKQog ewotICAgIGlmIChtX3BlbmRpbmdQZXJtaXNzaW9uR2VvbG9jYXRpb24pCi0gICAgICAgIG1fcGVu ZGluZ1Blcm1pc3Npb25HZW9sb2NhdGlvbi0+c2V0SXNBbGxvd2VkKGlzQWxsb3dlZCk7CisgICAg VmVjdG9yPFJlZlB0cjxHZW9sb2NhdGlvbj4gPiBwZW5kaW5nUGVybWlzc2lvbkdlb2xvY2F0aW9u ID0gbV9nZW9sb2NhdGlvblJlcXVlc3RNYXAuZ2V0KG9yaWdpbik7CisKKyAgICBpZiAocGVuZGlu Z1Blcm1pc3Npb25HZW9sb2NhdGlvbi5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKworICAg IHNpemVfdCBudW1iZXJPZkdlb2xvY2F0aW9ucyA9IHBlbmRpbmdQZXJtaXNzaW9uR2VvbG9jYXRp b24uc2l6ZSgpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbnVtYmVyT2ZHZW9sb2NhdGlv bnM7ICsraSkKKyAgICAgICAgcGVuZGluZ1Blcm1pc3Npb25HZW9sb2NhdGlvbltpXS0+c2V0SXNB bGxvd2VkKGlzQWxsb3dlZCk7CisgICAgbV9nZW9sb2NhdGlvblJlcXVlc3RNYXAucmVtb3ZlKG9y aWdpbik7CiB9CiAKIHZvaWQgR2VvbG9jYXRpb25DbGllbnRCbGFja0JlcnJ5OjpzZXRFbmFibGVI aWdoQWNjdXJhY3koYm9vbCBuZXdBY2N1cmFjeSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnkuaCBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVu dEJsYWNrQmVycnkuaAppbmRleCBjMmYwMzQ1MDQ2YjYzMWZkNjc4MWU0ODdkZjhjZTk5M2NhOTEz NGUyLi43OGQ3ODc4YjdmYjk3OGYzZmIzNzlmMjc1NmFhZDE5YjQ4YjEzNGYxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGll bnRCbGFja0JlcnJ5LmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBw b3J0L0dlb2xvY2F0aW9uQ2xpZW50QmxhY2tCZXJyeS5oCkBAIC0yMiw3ICsyMiw5IEBACiAjaW5j bHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtR2VvVHJhY2tlci5oPgogI2luY2x1ZGUgPEJsYWNrQmVy cnlQbGF0Zm9ybUdlb1RyYWNrZXJMaXN0ZW5lci5oPgogI2luY2x1ZGUgPEdlb2xvY2F0aW9uQ2xp ZW50Lmg+CisjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+ CisjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIG5hbWVzcGFjZSBCbGFja0JlcnJ5 IHsKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtNDgsMTIgKzUwLDEyIEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHZvaWQgb25Mb2NhdGlvblVwZGF0ZShkb3VibGUgdGltZXN0YW1wLCBkb3VibGUgbGF0 aXR1ZGUsIGRvdWJsZSBsb25naXR1ZGUsIGRvdWJsZSBhY2N1cmFjeSwgZG91YmxlIGFsdGl0dWRl LCBib29sIGFsdGl0dWRlVmFsaWQsIGRvdWJsZSBhbHRpdHVkZUFjY3VyYWN5LAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgYWx0aXR1ZGVBY2N1cmFjeVZhbGlkLCBkb3Vi bGUgc3BlZWQsIGJvb2wgc3BlZWRWYWxpZCwgZG91YmxlIGhlYWRpbmcsIGJvb2wgaGVhZGluZ1Zh bGlkKTsKICAgICB2aXJ0dWFsIHZvaWQgb25Mb2NhdGlvbkVycm9yKGNvbnN0IGNoYXIqIGVycm9y KTsKLSAgICB2aXJ0dWFsIHZvaWQgb25QZXJtaXNzaW9uKGJvb2wgaXNBbGxvd2VkKTsKKyAgICB2 aXJ0dWFsIHZvaWQgb25QZXJtaXNzaW9uKGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJp bmcmIG9yaWdpbiwgYm9vbCBpc0FsbG93ZWQpOwogCiBwcml2YXRlOgogICAgIEJsYWNrQmVycnk6 OldlYktpdDo6V2ViUGFnZVByaXZhdGUqIG1fd2ViUGFnZVByaXZhdGU7Ci0gICAgUmVmUHRyPEdl b2xvY2F0aW9uPiBtX3BlbmRpbmdQZXJtaXNzaW9uR2VvbG9jYXRpb247CiAgICAgUmVmUHRyPEdl b2xvY2F0aW9uUG9zaXRpb24+IG1fbGFzdFBvc2l0aW9uOworICAgIEhhc2hNYXA8U3RyaW5nLCBW ZWN0b3I8UmVmUHRyPEdlb2xvY2F0aW9uPiA+ID4gbV9nZW9sb2NhdGlvblJlcXVlc3RNYXA7CiAg ICAgYm9vbCBtX2FjY3VyYWN5OwogICAgIGJvb2wgbV9pc0FjdGl2ZTsKIH07Cg== 177754 2012-12-05 08:16:08 -0800 2012-12-05 08:21:01 -0800 Patch bug-104123-20121205111333.patch text/plain 7692 otcheung U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAzMGY3NDM3ODFiOWIzZjg3MTZlNzJjOTdiZThhMjBkZTJiYzhkZWFiLi4yMjZiNzFkZDgz ZWYzY2QwZTA1ZGY1NGQ2Y2Y4OGIyOWVjMDcxMzE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMi0xMi0wNSAgT3R0byBEZXJlayBDaGV1bmcgIDxv dGNoZXVuZ0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBHZW9sb2NhdGlvbkNsaWVu dEJCIG9ubHkgaG9sZGluZyB0aGUgbGF0ZXN0IGdlb2xvY2F0aW9uIHBlcm1pc3Npb24gcmVxdWVz dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0MTIz CisKKyAgICAgICAgUFIgMjU2MDg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIGEgbWFwcGluZyBiZXR3ZWVuIG9yaWdpbiBVUkwgYW5kIGl0J3Mg Z2VvbG9jYXRpb24gb2JqZWN0IHNvIHdlIGNvdWxkCisgICAgICAgIHJlc3BvbmQgdG8gdGhlIGNv cnJlY3QgZ2VvbG9jYXRpb24gd2hlbiBsaWJ3ZWJ2aWV3IHJlc3BvbmRzIHdpdGggb25QZXJtaXNz aW9uCisgICAgICAgIGluIEdlb2xvY2F0aW9uQ2xpZW50LgorCisgICAgICAgIFVzaW5nIHRoZSBt YXBwaW5nLCB3ZSBjb3VsZCBhbHNvIHByZXZlbnQgcmVxdWVzdEdlb2xvY2F0aW9uIHJlcXVlc3Rz IGZyb20gdGhlIHNhbWUgb3JpZ2luCisgICAgICAgIHRvIGJlIHNlbnQgdHdpY2UuIFRoaXMgcHJl dmVudHMgcGFnZXMgdGhhdCBob2xkIHR3byBpZnJhbWVzIHRvIHRoZSBzYW1lIHJlc291cmNlIHRv IHJlcXVlc3QKKyAgICAgICAgZ2VvbG9jYXRpb24gcGVybWlzc2lvbiBvbiB0aGUgc2FtZSBzZWN1 cml0eSBvcmlnaW4gdHdpY2UuCisKKyAgICAgICAgVGVzdGVkIHRoaXMgYnkgcnVubmluZyBhIHBh Z2UgdGhhdCBpbmNsdWRlcyAyIG9yIG1vcmUgaWZyYW1lcyB0aGF0IHJlcXVlc3RzIGdlb2xvY2F0 aW9uCisgICAgICAgIHBlcm1pc3Npb24uCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9HZW9s b2NhdGlvbkNsaWVudEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoR2VvbG9jYXRpb25DbGllbnRC bGFja0JlcnJ5OjpyZXF1ZXN0UGVybWlzc2lvbik6CisgICAgICAgIChHZW9sb2NhdGlvbkNsaWVu dEJsYWNrQmVycnk6OmNhbmNlbFBlcm1pc3Npb25SZXF1ZXN0KToKKyAgICAgICAgKEdlb2xvY2F0 aW9uQ2xpZW50QmxhY2tCZXJyeTo6b25QZXJtaXNzaW9uKToKKyAgICAgICAgKiBXZWJDb3JlU3Vw cG9ydC9HZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnkuaDoKKyAgICAgICAgKEdlb2xvY2F0aW9u Q2xpZW50QmxhY2tCZXJyeSk6CisKIDIwMTItMTItMDIgIFRpYW5jaGVuZyBKaWFuZyAgPHRpamlh bmdAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV1UYXAgaGlnaGxpZ2h0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25D bGllbnRCbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3Vw cG9ydC9HZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnkuY3BwCmluZGV4IDMxZTgzMmY2MzBkOTYw OGY1MjAyYzVhZTJmMzE0YWJmMTk1MjUzZjAuLjllNDc0YTc1MWRkZTk0M2NiMTdlNDU3MjVlYTRh YTExZTZmNmUwNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3Jl U3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnku Y3BwCkBAIC0zMCwxMyArMzAsNiBAQAogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAotc3Rh dGljIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcgZnJhbWVPcmlnaW4oRnJhbWUq IGZyYW1lKQotewotICAgIERPTVdpbmRvdyogd2luZG93ID0gZnJhbWUtPmRvY3VtZW50KCktPmRv bVdpbmRvdygpOwotICAgIFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4gPSB3aW5kb3ctPmRvY3VtZW50 KCktPnNlY3VyaXR5T3JpZ2luKCk7Ci0gICAgcmV0dXJuIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpT dHJpbmcob3JpZ2luLT50b1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwotfQotCiBHZW9sb2NhdGlv bkNsaWVudEJsYWNrQmVycnk6Okdlb2xvY2F0aW9uQ2xpZW50QmxhY2tCZXJyeShCbGFja0JlcnJ5 OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlKiB3ZWJQYWdlUHJpdmF0ZSkKICAgICA6IG1fd2ViUGFn ZVByaXZhdGUod2ViUGFnZVByaXZhdGUpCiAgICAgLCBtX2FjY3VyYWN5KGZhbHNlKQpAQCAtODAs MTIgKzczLDcgQEAgdm9pZCBHZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnk6OnJlcXVlc3RQZXJt aXNzaW9uKEdlb2xvY2F0aW9uKiBsb2NhdGlvbikKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAot ICAgIERPTVdpbmRvdyogd2luZG93ID0gZnJhbWUtPmRvY3VtZW50KCktPmRvbVdpbmRvdygpOwot ICAgIGlmICghd2luZG93KQotICAgICAgICByZXR1cm47Ci0KLSAgICBjb25zdCBCbGFja0JlcnJ5 OjpQbGF0Zm9ybTo6U3RyaW5nIG9yaWdpbiA9IGZyYW1lT3JpZ2luKGZyYW1lKTsKLSAgICBtX3Bl bmRpbmdQZXJtaXNzaW9uR2VvbG9jYXRpb24gPSBsb2NhdGlvbjsKKyAgICBjb25zdCBTdHJpbmcg b3JpZ2luID0gZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPnRvU3RyaW5nKCk7 CiAKICAgICAvLyBDaGVjayBnbG9iYWwgbG9jYXRpb24gc2V0dGluZywgaWYgaXQgaXMgb2ZmIHRo ZW4gd2UgcmVxdWVzdCBhbiBpbmZvYmFyIHRoYXQgaW52b2tlcyBhIGxvY2F0aW9uIHNldHRpbmdz IGNhcmQuCiAgICAgLy8gSWYgaXQncyBvbiwgdGhlbiB3ZSByZXF1ZXN0IGFuIGluZm9iYXIgdGhh dCBhbGxvd3MgdGhlIHNpdGUgdG8gaGF2ZSBwZXJtaXNzaW9uIHRvIHVzZSBnZW9sb2NhdGlvbi4K QEAgLTk1LDE1ICs4Myw0OCBAQCB2b2lkIEdlb2xvY2F0aW9uQ2xpZW50QmxhY2tCZXJyeTo6cmVx dWVzdFBlcm1pc3Npb24oR2VvbG9jYXRpb24qIGxvY2F0aW9uKQogICAgICAgICAgICAgbV93ZWJQ YWdlUHJpdmF0ZS0+bV9jbGllbnQtPnJlcXVlc3RHbG9iYWxMb2NhbFNlcnZpY2VQZXJtaXNzaW9u KHRoaXMsIG9yaWdpbik7CiAgICAgICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R2VvbG9j YXRpb25IYW5kbGVyOjppbnN0YW5jZSgpLT5zZXRBc2tlZFVzZXJGb3JHbG9iYWxQZXJtaXNzaW9u KCk7CiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgb25QZXJtaXNzaW9uKGZhbHNlKTsKKyAg ICAgICAgICAgIGxvY2F0aW9uLT5zZXRJc0FsbG93ZWQoZmFsc2UpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0gICAgbV93ZWJQYWdlUHJpdmF0ZS0+bV9jbGllbnQtPnJlcXVlc3RHZW9sb2Nh dGlvblBlcm1pc3Npb24odGhpcywgb3JpZ2luKTsKKyAgICAvLyBBZGQgdGhpcyBnZW9sb2NhdGlv biBwZXJtaXNzaW9uIHJlcXVlc3QgdG8gb3VyIHJlcXVlc3QgbWFwLgorICAgIFZlY3RvcjxSZWZQ dHI8R2VvbG9jYXRpb24+ID4gZ2VvUmVxdWVzdHNGb3JPcmlnaW47CisgICAgSGFzaE1hcDxTdHJp bmcsIFZlY3RvcjxSZWZQdHI8R2VvbG9jYXRpb24+ID4gPjo6QWRkUmVzdWx0IHJlc3VsdCA9IG1f Z2VvbG9jYXRpb25SZXF1ZXN0TWFwLmFkZChvcmlnaW4sIGdlb1JlcXVlc3RzRm9yT3JpZ2luKTsK KyAgICByZXN1bHQuaXRlcmF0b3ItPnZhbHVlLmFwcGVuZChsb2NhdGlvbik7CisKKyAgICAvLyBB dm9pZCBzZW5kaW5nIGFub3RoZXIgcmVxdWVzdCBpZiB0aGUgdmVjdG9yIGFscmVhZHkgaGFzIGFu b3RoZXIgZ2VvbG9jYXRpb24gcGVuZGluZyBmb3IgdGhpcyBvcmlnaW4gaW4gdGhpcyBwYWdlLgor ICAgIGlmIChyZXN1bHQuaXNOZXdFbnRyeSkKKyAgICAgICAgbV93ZWJQYWdlUHJpdmF0ZS0+bV9j bGllbnQtPnJlcXVlc3RHZW9sb2NhdGlvblBlcm1pc3Npb24odGhpcywgb3JpZ2luKTsKIH0KIAog dm9pZCBHZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnk6OmNhbmNlbFBlcm1pc3Npb25SZXF1ZXN0 KEdlb2xvY2F0aW9uKiBsb2NhdGlvbikKIHsKKyAgICBGcmFtZSogZnJhbWUgPSBsb2NhdGlvbi0+ ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm47CisKKyAgICBjb25zdCBT dHJpbmcgb3JpZ2luID0gZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPnRvU3Ry aW5nKCk7CisKKyAgICAvLyBSZW1vdmUgdGhlIGdlb2xvY2F0aW9uIGZyb20gdGhlIHBlbmRpbmcg cGVybWlzc2lvbiBtYXAuCisgICAgSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxSZWZQdHI8R2VvbG9j YXRpb24+ID4gPjo6aXRlcmF0b3IgaXQgPSBtX2dlb2xvY2F0aW9uUmVxdWVzdE1hcC5maW5kKG9y aWdpbik7CisKKyAgICBBU1NFUlQoaXQgIT0gbV9nZW9sb2NhdGlvblJlcXVlc3RNYXAuZW5kKCkp OworICAgIGlmIChpdCAhPSBtX2dlb2xvY2F0aW9uUmVxdWVzdE1hcC5lbmQoKSkKKyAgICAgICAg cmV0dXJuOworCisgICAgVmVjdG9yPFJlZlB0cjxHZW9sb2NhdGlvbj4gPiogcmVzdWx0ID0gJihp dC0+dmFsdWUpOworCisgICAgc2l6ZV90IGdlb2xvY2F0aW9uQ291bnQgPSByZXN1bHQtPnNpemUo KTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGdlb2xvY2F0aW9uQ291bnQ7ICsraSkgewor ICAgICAgICBpZiAoKCpyZXN1bHQpW2ldLmdldCgpID09IGxvY2F0aW9uKSB7CisgICAgICAgICAg ICByZXN1bHQtPnJlbW92ZShpKTsKKyAgICAgICAgICAgIC8vIFJlbW92ZSB0aGlzIHZlY3RvciBm cm9tIHRoZSBwZW5kaW5nIHBlcm1pc3Npb24gbWFwIGlzIGl0IGRvZXNuJ3QgY29udGFpbiBhbnlt b3JlIGdlbyBvYmplY3RzCisgICAgICAgICAgICBpZiAocmVzdWx0LT5pc0VtcHR5KCkpCisgICAg ICAgICAgICAgICAgbV9nZW9sb2NhdGlvblJlcXVlc3RNYXAucmVtb3ZlKG9yaWdpbik7CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0KKwogICAgIG1fd2ViUGFnZVByaXZhdGUt Pm1fY2xpZW50LT5jYW5jZWxHZW9sb2NhdGlvblBlcm1pc3Npb24oKTsKIH0KIApAQCAtMTIxLDEw ICsxNDIsMTcgQEAgdm9pZCBHZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnk6Om9uTG9jYXRpb25F cnJvcihjb25zdCBjaGFyKiBlcnJvclN0cikKICAgICBHZW9sb2NhdGlvbkNvbnRyb2xsZXI6OmZy b20obV93ZWJQYWdlUHJpdmF0ZS0+bV9wYWdlKS0+ZXJyb3JPY2N1cnJlZChlcnJvci5nZXQoKSk7 CiB9CiAKLXZvaWQgR2VvbG9jYXRpb25DbGllbnRCbGFja0JlcnJ5OjpvblBlcm1pc3Npb24oYm9v bCBpc0FsbG93ZWQpCit2b2lkIEdlb2xvY2F0aW9uQ2xpZW50QmxhY2tCZXJyeTo6b25QZXJtaXNz aW9uKGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIG9yaWdpbiwgYm9vbCBpc0Fs bG93ZWQpCiB7Ci0gICAgaWYgKG1fcGVuZGluZ1Blcm1pc3Npb25HZW9sb2NhdGlvbikKLSAgICAg ICAgbV9wZW5kaW5nUGVybWlzc2lvbkdlb2xvY2F0aW9uLT5zZXRJc0FsbG93ZWQoaXNBbGxvd2Vk KTsKKyAgICBWZWN0b3I8UmVmUHRyPEdlb2xvY2F0aW9uPiA+IHBlbmRpbmdQZXJtaXNzaW9uR2Vv bG9jYXRpb24gPSBtX2dlb2xvY2F0aW9uUmVxdWVzdE1hcC5nZXQob3JpZ2luKTsKKworICAgIGlm IChwZW5kaW5nUGVybWlzc2lvbkdlb2xvY2F0aW9uLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJu OworCisgICAgc2l6ZV90IG51bWJlck9mR2VvbG9jYXRpb25zID0gcGVuZGluZ1Blcm1pc3Npb25H ZW9sb2NhdGlvbi5zaXplKCk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1iZXJPZkdl b2xvY2F0aW9uczsgKytpKQorICAgICAgICBwZW5kaW5nUGVybWlzc2lvbkdlb2xvY2F0aW9uW2ld LT5zZXRJc0FsbG93ZWQoaXNBbGxvd2VkKTsKKyAgICBtX2dlb2xvY2F0aW9uUmVxdWVzdE1hcC5y ZW1vdmUob3JpZ2luKTsKIH0KIAogdm9pZCBHZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnk6OnNl dEVuYWJsZUhpZ2hBY2N1cmFjeShib29sIG5ld0FjY3VyYWN5KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50QmxhY2tC ZXJyeS5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0 aW9uQ2xpZW50QmxhY2tCZXJyeS5oCmluZGV4IGMyZjAzNDUwNDZiNjMxZmQ2NzgxZTQ4N2RmOGNl OTkzY2E5MTM0ZTIuLjc4ZDc4NzhiN2ZiOTc4ZjNmYjM3OWYyNzU2YWFkMTliNDhiMTM0ZjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9HZW9sb2Nh dGlvbkNsaWVudEJsYWNrQmVycnkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2Vi Q29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRCbGFja0JlcnJ5LmgKQEAgLTIyLDcgKzIyLDkg QEAKICNpbmNsdWRlIDxCbGFja0JlcnJ5UGxhdGZvcm1HZW9UcmFja2VyLmg+CiAjaW5jbHVkZSA8 QmxhY2tCZXJyeVBsYXRmb3JtR2VvVHJhY2tlckxpc3RlbmVyLmg+CiAjaW5jbHVkZSA8R2VvbG9j YXRpb25DbGllbnQuaD4KKyNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9S ZWZQdHIuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNlIEJs YWNrQmVycnkgewogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC00OCwxMiArNTAsMTIgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBvbkxvY2F0aW9uVXBkYXRlKGRvdWJsZSB0aW1lc3RhbXAsIGRv dWJsZSBsYXRpdHVkZSwgZG91YmxlIGxvbmdpdHVkZSwgZG91YmxlIGFjY3VyYWN5LCBkb3VibGUg YWx0aXR1ZGUsIGJvb2wgYWx0aXR1ZGVWYWxpZCwgZG91YmxlIGFsdGl0dWRlQWNjdXJhY3ksCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBhbHRpdHVkZUFjY3VyYWN5VmFs aWQsIGRvdWJsZSBzcGVlZCwgYm9vbCBzcGVlZFZhbGlkLCBkb3VibGUgaGVhZGluZywgYm9vbCBo ZWFkaW5nVmFsaWQpOwogICAgIHZpcnR1YWwgdm9pZCBvbkxvY2F0aW9uRXJyb3IoY29uc3QgY2hh ciogZXJyb3IpOwotICAgIHZpcnR1YWwgdm9pZCBvblBlcm1pc3Npb24oYm9vbCBpc0FsbG93ZWQp OworICAgIHZpcnR1YWwgdm9pZCBvblBlcm1pc3Npb24oY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZv cm06OlN0cmluZyYgb3JpZ2luLCBib29sIGlzQWxsb3dlZCk7CiAKIHByaXZhdGU6CiAgICAgQmxh Y2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZSogbV93ZWJQYWdlUHJpdmF0ZTsKLSAgICBS ZWZQdHI8R2VvbG9jYXRpb24+IG1fcGVuZGluZ1Blcm1pc3Npb25HZW9sb2NhdGlvbjsKICAgICBS ZWZQdHI8R2VvbG9jYXRpb25Qb3NpdGlvbj4gbV9sYXN0UG9zaXRpb247CisgICAgSGFzaE1hcDxT dHJpbmcsIFZlY3RvcjxSZWZQdHI8R2VvbG9jYXRpb24+ID4gPiBtX2dlb2xvY2F0aW9uUmVxdWVz dE1hcDsKICAgICBib29sIG1fYWNjdXJhY3k7CiAgICAgYm9vbCBtX2lzQWN0aXZlOwogfTsK 177755 2012-12-05 08:21:18 -0800 2012-12-05 08:49:16 -0800 Patch bug-104123-20121205111838.patch text/plain 7692 otcheung U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAzMGY3NDM3ODFiOWIzZjg3MTZlNzJjOTdiZThhMjBkZTJiYzhkZWFiLi4yMjZiNzFkZDgz ZWYzY2QwZTA1ZGY1NGQ2Y2Y4OGIyOWVjMDcxMzE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMi0xMi0wNSAgT3R0byBEZXJlayBDaGV1bmcgIDxv dGNoZXVuZ0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBHZW9sb2NhdGlvbkNsaWVu dEJCIG9ubHkgaG9sZGluZyB0aGUgbGF0ZXN0IGdlb2xvY2F0aW9uIHBlcm1pc3Npb24gcmVxdWVz dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0MTIz CisKKyAgICAgICAgUFIgMjU2MDg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIGEgbWFwcGluZyBiZXR3ZWVuIG9yaWdpbiBVUkwgYW5kIGl0J3Mg Z2VvbG9jYXRpb24gb2JqZWN0IHNvIHdlIGNvdWxkCisgICAgICAgIHJlc3BvbmQgdG8gdGhlIGNv cnJlY3QgZ2VvbG9jYXRpb24gd2hlbiBsaWJ3ZWJ2aWV3IHJlc3BvbmRzIHdpdGggb25QZXJtaXNz aW9uCisgICAgICAgIGluIEdlb2xvY2F0aW9uQ2xpZW50LgorCisgICAgICAgIFVzaW5nIHRoZSBt YXBwaW5nLCB3ZSBjb3VsZCBhbHNvIHByZXZlbnQgcmVxdWVzdEdlb2xvY2F0aW9uIHJlcXVlc3Rz IGZyb20gdGhlIHNhbWUgb3JpZ2luCisgICAgICAgIHRvIGJlIHNlbnQgdHdpY2UuIFRoaXMgcHJl dmVudHMgcGFnZXMgdGhhdCBob2xkIHR3byBpZnJhbWVzIHRvIHRoZSBzYW1lIHJlc291cmNlIHRv IHJlcXVlc3QKKyAgICAgICAgZ2VvbG9jYXRpb24gcGVybWlzc2lvbiBvbiB0aGUgc2FtZSBzZWN1 cml0eSBvcmlnaW4gdHdpY2UuCisKKyAgICAgICAgVGVzdGVkIHRoaXMgYnkgcnVubmluZyBhIHBh Z2UgdGhhdCBpbmNsdWRlcyAyIG9yIG1vcmUgaWZyYW1lcyB0aGF0IHJlcXVlc3RzIGdlb2xvY2F0 aW9uCisgICAgICAgIHBlcm1pc3Npb24uCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9HZW9s b2NhdGlvbkNsaWVudEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoR2VvbG9jYXRpb25DbGllbnRC bGFja0JlcnJ5OjpyZXF1ZXN0UGVybWlzc2lvbik6CisgICAgICAgIChHZW9sb2NhdGlvbkNsaWVu dEJsYWNrQmVycnk6OmNhbmNlbFBlcm1pc3Npb25SZXF1ZXN0KToKKyAgICAgICAgKEdlb2xvY2F0 aW9uQ2xpZW50QmxhY2tCZXJyeTo6b25QZXJtaXNzaW9uKToKKyAgICAgICAgKiBXZWJDb3JlU3Vw cG9ydC9HZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnkuaDoKKyAgICAgICAgKEdlb2xvY2F0aW9u Q2xpZW50QmxhY2tCZXJyeSk6CisKIDIwMTItMTItMDIgIFRpYW5jaGVuZyBKaWFuZyAgPHRpamlh bmdAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV1UYXAgaGlnaGxpZ2h0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25D bGllbnRCbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3Vw cG9ydC9HZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnkuY3BwCmluZGV4IDMxZTgzMmY2MzBkOTYw OGY1MjAyYzVhZTJmMzE0YWJmMTk1MjUzZjAuLmI2YTRiYzM2OGRlMTViZjBjNjNlYTBjOTVkZTA5 NTZhOWM4ZDA3ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3Jl U3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnku Y3BwCkBAIC0zMCwxMyArMzAsNiBAQAogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAotc3Rh dGljIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcgZnJhbWVPcmlnaW4oRnJhbWUq IGZyYW1lKQotewotICAgIERPTVdpbmRvdyogd2luZG93ID0gZnJhbWUtPmRvY3VtZW50KCktPmRv bVdpbmRvdygpOwotICAgIFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4gPSB3aW5kb3ctPmRvY3VtZW50 KCktPnNlY3VyaXR5T3JpZ2luKCk7Ci0gICAgcmV0dXJuIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpT dHJpbmcob3JpZ2luLT50b1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwotfQotCiBHZW9sb2NhdGlv bkNsaWVudEJsYWNrQmVycnk6Okdlb2xvY2F0aW9uQ2xpZW50QmxhY2tCZXJyeShCbGFja0JlcnJ5 OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlKiB3ZWJQYWdlUHJpdmF0ZSkKICAgICA6IG1fd2ViUGFn ZVByaXZhdGUod2ViUGFnZVByaXZhdGUpCiAgICAgLCBtX2FjY3VyYWN5KGZhbHNlKQpAQCAtODAs MTIgKzczLDcgQEAgdm9pZCBHZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnk6OnJlcXVlc3RQZXJt aXNzaW9uKEdlb2xvY2F0aW9uKiBsb2NhdGlvbikKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAot ICAgIERPTVdpbmRvdyogd2luZG93ID0gZnJhbWUtPmRvY3VtZW50KCktPmRvbVdpbmRvdygpOwot ICAgIGlmICghd2luZG93KQotICAgICAgICByZXR1cm47Ci0KLSAgICBjb25zdCBCbGFja0JlcnJ5 OjpQbGF0Zm9ybTo6U3RyaW5nIG9yaWdpbiA9IGZyYW1lT3JpZ2luKGZyYW1lKTsKLSAgICBtX3Bl bmRpbmdQZXJtaXNzaW9uR2VvbG9jYXRpb24gPSBsb2NhdGlvbjsKKyAgICBjb25zdCBTdHJpbmcg b3JpZ2luID0gZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPnRvU3RyaW5nKCk7 CiAKICAgICAvLyBDaGVjayBnbG9iYWwgbG9jYXRpb24gc2V0dGluZywgaWYgaXQgaXMgb2ZmIHRo ZW4gd2UgcmVxdWVzdCBhbiBpbmZvYmFyIHRoYXQgaW52b2tlcyBhIGxvY2F0aW9uIHNldHRpbmdz IGNhcmQuCiAgICAgLy8gSWYgaXQncyBvbiwgdGhlbiB3ZSByZXF1ZXN0IGFuIGluZm9iYXIgdGhh dCBhbGxvd3MgdGhlIHNpdGUgdG8gaGF2ZSBwZXJtaXNzaW9uIHRvIHVzZSBnZW9sb2NhdGlvbi4K QEAgLTk1LDE1ICs4Myw0OCBAQCB2b2lkIEdlb2xvY2F0aW9uQ2xpZW50QmxhY2tCZXJyeTo6cmVx dWVzdFBlcm1pc3Npb24oR2VvbG9jYXRpb24qIGxvY2F0aW9uKQogICAgICAgICAgICAgbV93ZWJQ YWdlUHJpdmF0ZS0+bV9jbGllbnQtPnJlcXVlc3RHbG9iYWxMb2NhbFNlcnZpY2VQZXJtaXNzaW9u KHRoaXMsIG9yaWdpbik7CiAgICAgICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R2VvbG9j YXRpb25IYW5kbGVyOjppbnN0YW5jZSgpLT5zZXRBc2tlZFVzZXJGb3JHbG9iYWxQZXJtaXNzaW9u KCk7CiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgb25QZXJtaXNzaW9uKGZhbHNlKTsKKyAg ICAgICAgICAgIGxvY2F0aW9uLT5zZXRJc0FsbG93ZWQoZmFsc2UpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0gICAgbV93ZWJQYWdlUHJpdmF0ZS0+bV9jbGllbnQtPnJlcXVlc3RHZW9sb2Nh dGlvblBlcm1pc3Npb24odGhpcywgb3JpZ2luKTsKKyAgICAvLyBBZGQgdGhpcyBnZW9sb2NhdGlv biBwZXJtaXNzaW9uIHJlcXVlc3QgdG8gb3VyIHJlcXVlc3QgbWFwLgorICAgIFZlY3RvcjxSZWZQ dHI8R2VvbG9jYXRpb24+ID4gZ2VvUmVxdWVzdHNGb3JPcmlnaW47CisgICAgSGFzaE1hcDxTdHJp bmcsIFZlY3RvcjxSZWZQdHI8R2VvbG9jYXRpb24+ID4gPjo6QWRkUmVzdWx0IHJlc3VsdCA9IG1f Z2VvbG9jYXRpb25SZXF1ZXN0TWFwLmFkZChvcmlnaW4sIGdlb1JlcXVlc3RzRm9yT3JpZ2luKTsK KyAgICByZXN1bHQuaXRlcmF0b3ItPnZhbHVlLmFwcGVuZChsb2NhdGlvbik7CisKKyAgICAvLyBB dm9pZCBzZW5kaW5nIGFub3RoZXIgcmVxdWVzdCBpZiB0aGUgdmVjdG9yIGFscmVhZHkgaGFzIGFu b3RoZXIgZ2VvbG9jYXRpb24gcGVuZGluZyBmb3IgdGhpcyBvcmlnaW4gaW4gdGhpcyBwYWdlLgor ICAgIGlmIChyZXN1bHQuaXNOZXdFbnRyeSkKKyAgICAgICAgbV93ZWJQYWdlUHJpdmF0ZS0+bV9j bGllbnQtPnJlcXVlc3RHZW9sb2NhdGlvblBlcm1pc3Npb24odGhpcywgb3JpZ2luKTsKIH0KIAog dm9pZCBHZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnk6OmNhbmNlbFBlcm1pc3Npb25SZXF1ZXN0 KEdlb2xvY2F0aW9uKiBsb2NhdGlvbikKIHsKKyAgICBGcmFtZSogZnJhbWUgPSBsb2NhdGlvbi0+ ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm47CisKKyAgICBjb25zdCBT dHJpbmcgb3JpZ2luID0gZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPnRvU3Ry aW5nKCk7CisKKyAgICAvLyBSZW1vdmUgdGhlIGdlb2xvY2F0aW9uIGZyb20gdGhlIHBlbmRpbmcg cGVybWlzc2lvbiBtYXAuCisgICAgSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxSZWZQdHI8R2VvbG9j YXRpb24+ID4gPjo6aXRlcmF0b3IgaXQgPSBtX2dlb2xvY2F0aW9uUmVxdWVzdE1hcC5maW5kKG9y aWdpbik7CisKKyAgICBBU1NFUlQoaXQgIT0gbV9nZW9sb2NhdGlvblJlcXVlc3RNYXAuZW5kKCkp OworICAgIGlmIChpdCA9PSBtX2dlb2xvY2F0aW9uUmVxdWVzdE1hcC5lbmQoKSkKKyAgICAgICAg cmV0dXJuOworCisgICAgVmVjdG9yPFJlZlB0cjxHZW9sb2NhdGlvbj4gPiogcmVzdWx0ID0gJihp dC0+dmFsdWUpOworCisgICAgc2l6ZV90IGdlb2xvY2F0aW9uQ291bnQgPSByZXN1bHQtPnNpemUo KTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGdlb2xvY2F0aW9uQ291bnQ7ICsraSkgewor ICAgICAgICBpZiAoKCpyZXN1bHQpW2ldLmdldCgpID09IGxvY2F0aW9uKSB7CisgICAgICAgICAg ICByZXN1bHQtPnJlbW92ZShpKTsKKyAgICAgICAgICAgIC8vIFJlbW92ZSB0aGlzIHZlY3RvciBm cm9tIHRoZSBwZW5kaW5nIHBlcm1pc3Npb24gbWFwIGlzIGl0IGRvZXNuJ3QgY29udGFpbiBhbnlt b3JlIGdlbyBvYmplY3RzCisgICAgICAgICAgICBpZiAocmVzdWx0LT5pc0VtcHR5KCkpCisgICAg ICAgICAgICAgICAgbV9nZW9sb2NhdGlvblJlcXVlc3RNYXAucmVtb3ZlKG9yaWdpbik7CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0KKwogICAgIG1fd2ViUGFnZVByaXZhdGUt Pm1fY2xpZW50LT5jYW5jZWxHZW9sb2NhdGlvblBlcm1pc3Npb24oKTsKIH0KIApAQCAtMTIxLDEw ICsxNDIsMTcgQEAgdm9pZCBHZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnk6Om9uTG9jYXRpb25F cnJvcihjb25zdCBjaGFyKiBlcnJvclN0cikKICAgICBHZW9sb2NhdGlvbkNvbnRyb2xsZXI6OmZy b20obV93ZWJQYWdlUHJpdmF0ZS0+bV9wYWdlKS0+ZXJyb3JPY2N1cnJlZChlcnJvci5nZXQoKSk7 CiB9CiAKLXZvaWQgR2VvbG9jYXRpb25DbGllbnRCbGFja0JlcnJ5OjpvblBlcm1pc3Npb24oYm9v bCBpc0FsbG93ZWQpCit2b2lkIEdlb2xvY2F0aW9uQ2xpZW50QmxhY2tCZXJyeTo6b25QZXJtaXNz aW9uKGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIG9yaWdpbiwgYm9vbCBpc0Fs bG93ZWQpCiB7Ci0gICAgaWYgKG1fcGVuZGluZ1Blcm1pc3Npb25HZW9sb2NhdGlvbikKLSAgICAg ICAgbV9wZW5kaW5nUGVybWlzc2lvbkdlb2xvY2F0aW9uLT5zZXRJc0FsbG93ZWQoaXNBbGxvd2Vk KTsKKyAgICBWZWN0b3I8UmVmUHRyPEdlb2xvY2F0aW9uPiA+IHBlbmRpbmdQZXJtaXNzaW9uR2Vv bG9jYXRpb24gPSBtX2dlb2xvY2F0aW9uUmVxdWVzdE1hcC5nZXQob3JpZ2luKTsKKworICAgIGlm IChwZW5kaW5nUGVybWlzc2lvbkdlb2xvY2F0aW9uLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJu OworCisgICAgc2l6ZV90IG51bWJlck9mR2VvbG9jYXRpb25zID0gcGVuZGluZ1Blcm1pc3Npb25H ZW9sb2NhdGlvbi5zaXplKCk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1iZXJPZkdl b2xvY2F0aW9uczsgKytpKQorICAgICAgICBwZW5kaW5nUGVybWlzc2lvbkdlb2xvY2F0aW9uW2ld LT5zZXRJc0FsbG93ZWQoaXNBbGxvd2VkKTsKKyAgICBtX2dlb2xvY2F0aW9uUmVxdWVzdE1hcC5y ZW1vdmUob3JpZ2luKTsKIH0KIAogdm9pZCBHZW9sb2NhdGlvbkNsaWVudEJsYWNrQmVycnk6OnNl dEVuYWJsZUhpZ2hBY2N1cmFjeShib29sIG5ld0FjY3VyYWN5KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50QmxhY2tC ZXJyeS5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0 aW9uQ2xpZW50QmxhY2tCZXJyeS5oCmluZGV4IGMyZjAzNDUwNDZiNjMxZmQ2NzgxZTQ4N2RmOGNl OTkzY2E5MTM0ZTIuLjc4ZDc4NzhiN2ZiOTc4ZjNmYjM3OWYyNzU2YWFkMTliNDhiMTM0ZjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9HZW9sb2Nh dGlvbkNsaWVudEJsYWNrQmVycnkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2Vi Q29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRCbGFja0JlcnJ5LmgKQEAgLTIyLDcgKzIyLDkg QEAKICNpbmNsdWRlIDxCbGFja0JlcnJ5UGxhdGZvcm1HZW9UcmFja2VyLmg+CiAjaW5jbHVkZSA8 QmxhY2tCZXJyeVBsYXRmb3JtR2VvVHJhY2tlckxpc3RlbmVyLmg+CiAjaW5jbHVkZSA8R2VvbG9j YXRpb25DbGllbnQuaD4KKyNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9S ZWZQdHIuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNlIEJs YWNrQmVycnkgewogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC00OCwxMiArNTAsMTIgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBvbkxvY2F0aW9uVXBkYXRlKGRvdWJsZSB0aW1lc3RhbXAsIGRv dWJsZSBsYXRpdHVkZSwgZG91YmxlIGxvbmdpdHVkZSwgZG91YmxlIGFjY3VyYWN5LCBkb3VibGUg YWx0aXR1ZGUsIGJvb2wgYWx0aXR1ZGVWYWxpZCwgZG91YmxlIGFsdGl0dWRlQWNjdXJhY3ksCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBhbHRpdHVkZUFjY3VyYWN5VmFs aWQsIGRvdWJsZSBzcGVlZCwgYm9vbCBzcGVlZFZhbGlkLCBkb3VibGUgaGVhZGluZywgYm9vbCBo ZWFkaW5nVmFsaWQpOwogICAgIHZpcnR1YWwgdm9pZCBvbkxvY2F0aW9uRXJyb3IoY29uc3QgY2hh ciogZXJyb3IpOwotICAgIHZpcnR1YWwgdm9pZCBvblBlcm1pc3Npb24oYm9vbCBpc0FsbG93ZWQp OworICAgIHZpcnR1YWwgdm9pZCBvblBlcm1pc3Npb24oY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZv cm06OlN0cmluZyYgb3JpZ2luLCBib29sIGlzQWxsb3dlZCk7CiAKIHByaXZhdGU6CiAgICAgQmxh Y2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZSogbV93ZWJQYWdlUHJpdmF0ZTsKLSAgICBS ZWZQdHI8R2VvbG9jYXRpb24+IG1fcGVuZGluZ1Blcm1pc3Npb25HZW9sb2NhdGlvbjsKICAgICBS ZWZQdHI8R2VvbG9jYXRpb25Qb3NpdGlvbj4gbV9sYXN0UG9zaXRpb247CisgICAgSGFzaE1hcDxT dHJpbmcsIFZlY3RvcjxSZWZQdHI8R2VvbG9jYXRpb24+ID4gPiBtX2dlb2xvY2F0aW9uUmVxdWVz dE1hcDsKICAgICBib29sIG1fYWNjdXJhY3k7CiAgICAgYm9vbCBtX2lzQWN0aXZlOwogfTsK