88675 2012-06-08 11:15:46 -0700 [BlackBerry] Fix crash on PagePopupChromeClient 2012-06-08 17:12:36 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 haizhang webkit-unassigned tonikitoo webkit.review.bot oldest_to_newest 644856 0 haizhang 2012-06-08 11:15:46 -0700 Actually it's the bug inside InputHandler, should delete the old popup and create a new one, because update() is problematic. 644882 1 146619 haizhang 2012-06-08 11:33:49 -0700 Created attachment 146619 patch 644915 2 146619 tonikitoo 2012-06-08 11:59:33 -0700 Comment on attachment 146619 patch maybe we could re-write the InputHandler::openSelectPopup part like: ... bool* enableds = 0; int* itemTypes = 0; bool* selecteds = 0; if (size) { enableds = new bool[size]; int* itemTypes = new int[size]; bool* selecteds = new bool[size]; blah; bleh; .... } selectClient = new SelectPopupClient(xxx, size, labels, enableds, itemTypes, selecteds, m_webPage, select); .... also "enableds" and "selecteds" are not a English :) 644928 3 146626 haizhang 2012-06-08 12:21:29 -0700 Created attachment 146626 updated patch 644937 4 146626 tonikitoo 2012-06-08 12:32:10 -0700 Comment on attachment 146626 updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=146626&action=review looks better. two questions ... > Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp:315 > void ChromeClientBlackBerry::closePagePopup(PagePopup* popup) is popup unused now? > Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:129 > + if (m_webPage->m_webPage->hasOpenedPopup()) > + m_webPage->m_page->chrome()->client()->closePagePopup(0); does it make sense to move the hasOpenedPopup check inside ::closePagePopup()? 644944 5 146626 haizhang 2012-06-08 12:38:28 -0700 Comment on attachment 146626 updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=146626&action=review >> Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp:315 >> void ChromeClientBlackBerry::closePagePopup(PagePopup* popup) > > is popup unused now? yes, we always get popup from m_webPage. >> Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:129 >> + m_webPage->m_page->chrome()->client()->closePagePopup(0); > > does it make sense to move the hasOpenedPopup check inside ::closePagePopup()? yeah, we can do that. 644965 6 146631 haizhang 2012-06-08 13:00:28 -0700 Created attachment 146631 updated patch 645141 7 146631 webkit.review.bot 2012-06-08 17:12:32 -0700 Comment on attachment 146631 updated patch Clearing flags on attachment: 146631 Committed r119880: <http://trac.webkit.org/changeset/119880> 645142 8 webkit.review.bot 2012-06-08 17:12:36 -0700 All reviewed patches have been landed. Closing bug. 146619 2012-06-08 11:33:49 -0700 2012-06-08 12:21:29 -0700 patch 0001-2012-06-08-Crystal-Zhang-haizhang-rim.com.patch text/plain 7157 haizhang RnJvbSBlYjZkODcyOTdjZTg3OTdlNTJmZDg0MWE4ODdjY2U0MmI2ZDljN2ZlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDcnlzdGFsIFpoYW5nIDxoYWl6aGFuZ0ByaW0uY29tPgpEYXRl OiBGcmksIDggSnVuIDIwMTIgMTQ6MzA6MjUgLTA0MDAKU3ViamVjdDogW1BBVENIXSAyMDEyLTA2 LTA4ICBDcnlzdGFsIFpoYW5nICA8aGFpemhhbmdAcmltLmNvbT4KCiAgICAgICAgW0JsYWNrQmVy cnldIEZpeCBjcmFzaCBvbiBQYWdlUG9wdXBDaHJvbWVDbGllbnQKICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg2NzUKCiAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCgogICAgICAgIFBSIDE2MzY3Mi4KCiAgICAgICAgQWN0dWFsbHkgaXQn cyB0aGUgYnVnIGluc2lkZSBJbnB1dEhhbmRsZXIsIHNob3VsZCBkZWxldGUgdGhlIG9sZCBwb3B1 cCBhbmQgY3JlYXRlIGEgbmV3IG9uZSwKICAgICAgICBiZWNhdXNlIHVwZGF0ZSgpIGlzIHByb2Js ZW1hdGljLiBBbHNvIG5vIG5lZWQgdG8gc2F2ZSBwb2ludGVyIGluIElucHV0SGFuZGxlci4KCiAg ICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcDoKICAgICAg ICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50QmxhY2tCZXJyeTo6b3BlblBhZ2VQb3B1cCk6CiAgICAg ICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudEJsYWNrQmVycnk6OmNsb3NlUGFnZVBvcHVwKToKICAg ICAgICAqIFdlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcDoKICAgICAgICAoQmxhY2tCZXJy eTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OklucHV0SGFuZGxlcik6CiAgICAgICAgKEJsYWNrQmVy cnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjp+SW5wdXRIYW5kbGVyKToKICAgICAgICAoQmxhY2tC ZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6Om9wZW5TZWxlY3RQb3B1cCk6CiAgICAgICAgKiBX ZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oOgogICAgICAgIChXZWJDb3JlKToKICAgICAgICAo SW5wdXRIYW5kbGVyKToKLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICB8ICAgMjMgKysrKysrKysrKysrKysrKysKIC4uLi9XZWJDb3JlU3VwcG9y dC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcCAgICAgIHwgICAxMyArKystLS0tLS0tCiAuLi4v YmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAgICAgICB8ICAgMjYgKysr KysrKysrLS0tLS0tLS0tLS0KIC4uLi9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lu cHV0SGFuZGxlci5oIHwgICAgMyAtLS0KIDQgZmlsZXMgY2hhbmdlZCwgMzkgaW5zZXJ0aW9ucygr KSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggOTk5 ZTlhYS4uNDgxMjFmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjYgQEAKKzIwMTItMDYtMDggIENyeXN0YWwgWmhhbmcgIDxoYWl6aGFuZ0ByaW0uY29tPgorCisg ICAgICAgIFtCbGFja0JlcnJ5XSBGaXggY3Jhc2ggb24gUGFnZVBvcHVwQ2hyb21lQ2xpZW50Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODY3NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBSIDE2MzY3Mi4K KworICAgICAgICBBY3R1YWxseSBpdCdzIHRoZSBidWcgaW5zaWRlIElucHV0SGFuZGxlciwgc2hv dWxkIGRlbGV0ZSB0aGUgb2xkIHBvcHVwIGFuZCBjcmVhdGUgYSBuZXcgb25lLAorICAgICAgICBi ZWNhdXNlIHVwZGF0ZSgpIGlzIHByb2JsZW1hdGljLiBBbHNvIG5vIG5lZWQgdG8gc2F2ZSBwb2lu dGVyIGluIElucHV0SGFuZGxlci4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNs aWVudEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50QmxhY2tC ZXJyeTo6b3BlblBhZ2VQb3B1cCk6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRCbGFj a0JlcnJ5OjpjbG9zZVBhZ2VQb3B1cCk6CisgICAgICAgICogV2ViS2l0U3VwcG9ydC9JbnB1dEhh bmRsZXIuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6Oklu cHV0SGFuZGxlcik6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6 fklucHV0SGFuZGxlcik6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxl cjo6b3BlblNlbGVjdFBvcHVwKToKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxl ci5oOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChJbnB1dEhhbmRsZXIpOgorCiAyMDEy LTA2LTA3ICBDcnlzdGFsIFpoYW5nICA8aGFpemhhbmdAcmltLmNvbT4KIAogICAgICAgICBbQmxh Y2tCZXJyeV0gU2hvdWxkIFVzZSB0aGUgV2ViUGFnZSBBbHJlYWR5IENyZWF0ZWQgYnkgQ2xpZW50 LCBObyBOZWVkIHRvIENyZWF0ZSBOZXcgT25lLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVy cnkuY3BwCmluZGV4IGYyZDAxYjMuLmZiMDk5OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50Qmxh Y2tCZXJyeS5jcHAKQEAgLTMwMywyMiArMzAzLDE3IEBAIFBhZ2VQb3B1cCogQ2hyb21lQ2xpZW50 QmxhY2tCZXJyeTo6b3BlblBhZ2VQb3B1cChQYWdlUG9wdXBDbGllbnQqIGNsaWVudCwgY29uc3QK IHsKICAgICBQYWdlUG9wdXBCbGFja0JlcnJ5KiB3ZWJQb3B1cDsKIAotICAgIGlmICghaGFzT3Bl bmVkUG9wdXAoKSkgewotICAgICAgICB3ZWJQb3B1cCA9IG5ldyBQYWdlUG9wdXBCbGFja0JlcnJ5 KG1fd2ViUGFnZVByaXZhdGUsIGNsaWVudCwKLSAgICAgICAgICAgICAgICByb290Vmlld1RvU2Ny ZWVuKG9yaWdpbkJvdW5kc0luUm9vdFZpZXcpKTsKLSAgICAgICAgbV93ZWJQYWdlUHJpdmF0ZS0+ bV93ZWJQYWdlLT5wb3B1cE9wZW5lZCh3ZWJQb3B1cCk7Ci0gICAgfSBlbHNlCi0gICAgICAgIHdl YlBvcHVwID0gbV93ZWJQYWdlUHJpdmF0ZS0+bV93ZWJQYWdlLT5wb3B1cCgpOworICAgIGlmICho YXNPcGVuZWRQb3B1cCgpKQorICAgICAgICBjbG9zZVBhZ2VQb3B1cCgwKTsKIAorICAgIHdlYlBv cHVwID0gbmV3IFBhZ2VQb3B1cEJsYWNrQmVycnkobV93ZWJQYWdlUHJpdmF0ZSwgY2xpZW50LCBy b290Vmlld1RvU2NyZWVuKG9yaWdpbkJvdW5kc0luUm9vdFZpZXcpKTsKKyAgICBtX3dlYlBhZ2VQ cml2YXRlLT5tX3dlYlBhZ2UtPnBvcHVwT3BlbmVkKHdlYlBvcHVwKTsKICAgICB3ZWJQb3B1cC0+ c2VuZENyZWF0ZVBvcHVwV2ViVmlld1JlcXVlc3QoKTsKICAgICByZXR1cm4gd2ViUG9wdXA7CiB9 CiAKIHZvaWQgQ2hyb21lQ2xpZW50QmxhY2tCZXJyeTo6Y2xvc2VQYWdlUG9wdXAoUGFnZVBvcHVw KiBwb3B1cCkKIHsKLSAgICBpZiAoIXBvcHVwKQotICAgICAgICByZXR1cm47Ci0KICAgICBQYWdl UG9wdXBCbGFja0JlcnJ5KiB3ZWJQb3B1cCA9IG1fd2ViUGFnZVByaXZhdGUtPm1fd2ViUGFnZS0+ cG9wdXAoKTsKICAgICB3ZWJQb3B1cC0+Y2xvc2VQb3B1cCgpOwogICAgIG1fd2ViUGFnZVByaXZh dGUtPm1fd2ViUGFnZS0+cG9wdXBDbG9zZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwCmluZGV4IDk1Yjk3YjIu LmZiODBjNTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBw b3J0L0lucHV0SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktp dFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcApAQCAtMTIwLDEzICsxMjAsMTMgQEAgSW5wdXRIYW5k bGVyOjpJbnB1dEhhbmRsZXIoV2ViUGFnZVByaXZhdGUqIHBhZ2UpCiAgICAgLCBtX2NvbXBvc2lu Z1RleHRFbmQoMCkKICAgICAsIG1fcGVuZGluZ0tleWJvYXJkVmlzaWJpbGl0eUNoYW5nZShOb0No YW5nZSkKICAgICAsIG1fZGVsYXlLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UoZmFsc2UpCi0gICAg LCBtX3NlbGVjdENsaWVudCgwKQogewogfQogCiBJbnB1dEhhbmRsZXI6On5JbnB1dEhhbmRsZXIo KQogewotICAgIGRlbGV0ZSBtX3NlbGVjdENsaWVudDsKKyAgICBpZiAobV93ZWJQYWdlLT5tX3dl YlBhZ2UtPmhhc09wZW5lZFBvcHVwKCkpCisgICAgICAgIG1fd2ViUGFnZS0+bV9wYWdlLT5jaHJv bWUoKS0+Y2xpZW50KCktPmNsb3NlUGFnZVBvcHVwKDApOwogfQogCiBzdGF0aWMgQmxhY2tCZXJy eUlucHV0VHlwZSBjb252ZXJ0SW5wdXRUeXBlKGNvbnN0IEhUTUxJbnB1dEVsZW1lbnQqIGlucHV0 RWxlbWVudCkKQEAgLTExNDIsMTIgKzExNDIsMTQgQEAgYm9vbCBJbnB1dEhhbmRsZXI6Om9wZW5T ZWxlY3RQb3B1cChIVE1MU2VsZWN0RWxlbWVudCogc2VsZWN0KQogICAgIFNjb3BlQXJyYXk8V2Vi U3RyaW5nPiBsYWJlbHM7CiAgICAgbGFiZWxzLnJlc2V0KG5ldyBXZWJTdHJpbmdbc2l6ZV0pOwog Ci0gICAgaWYgKCFzaXplKSB7Ci0gICAgICAgIGlmICghbV9zZWxlY3RDbGllbnQpCi0gICAgICAg ICAgICBtX3NlbGVjdENsaWVudCA9IG5ldyBTZWxlY3RQb3B1cENsaWVudChtdWx0aXBsZSwgc2l6 ZSwgbGFiZWxzLCAwLCAwLCAwLCBtX3dlYlBhZ2UsIHNlbGVjdCk7Ci0gICAgICAgIGVsc2UKLSAg ICAgICAgICAgIG1fc2VsZWN0Q2xpZW50LT51cGRhdGUobXVsdGlwbGUsIHNpemUsIGxhYmVscywg ZW5hYmxlZHMsIGl0ZW1UeXBlcywgc2VsZWN0ZWRzLCBtX3dlYlBhZ2UsIHNlbGVjdCk7Ci0gICAg fSBlbHNlIHsKKyAgICBTZWxlY3RQb3B1cENsaWVudCogc2VsZWN0Q2xpZW50ID0gMDsKKworICAg IGlmIChtX3dlYlBhZ2UtPm1fd2ViUGFnZS0+aGFzT3BlbmVkUG9wdXAoKSkKKyAgICAgICAgbV93 ZWJQYWdlLT5tX3BhZ2UtPmNocm9tZSgpLT5jbGllbnQoKS0+Y2xvc2VQYWdlUG9wdXAoMCk7CisK KyAgICBpZiAoIXNpemUpCisgICAgICAgIHNlbGVjdENsaWVudCA9IG5ldyBTZWxlY3RQb3B1cENs aWVudChtdWx0aXBsZSwgc2l6ZSwgbGFiZWxzLCAwLCAwLCAwLCBtX3dlYlBhZ2UsIHNlbGVjdCk7 CisgICAgZWxzZSB7CiAgICAgICAgIGJvb2wqIGVuYWJsZWRzID0gbmV3IGJvb2xbc2l6ZV07CiAg ICAgICAgIGludCogaXRlbVR5cGVzID0gbmV3IGludFtzaXplXTsKICAgICAgICAgYm9vbCogc2Vs ZWN0ZWRzID0gbmV3IGJvb2xbc2l6ZV07CkBAIC0xMTcxLDE1ICsxMTczLDExIEBAIGJvb2wgSW5w dXRIYW5kbGVyOjpvcGVuU2VsZWN0UG9wdXAoSFRNTFNlbGVjdEVsZW1lbnQqIHNlbGVjdCkKICAg ICAgICAgICAgICAgICBpdGVtVHlwZXNbaV0gPSBUeXBlU2VwYXJhdG9yOwogICAgICAgICAgICAg fQogICAgICAgICB9Ci0KLSAgICAgICAgaWYgKCFtX3NlbGVjdENsaWVudCkKLSAgICAgICAgICAg IG1fc2VsZWN0Q2xpZW50ID0gbmV3IFNlbGVjdFBvcHVwQ2xpZW50KG11bHRpcGxlLCBzaXplLCBs YWJlbHMsIGVuYWJsZWRzLCBpdGVtVHlwZXMsIHNlbGVjdGVkcywgbV93ZWJQYWdlLCBzZWxlY3Qp OwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX3NlbGVjdENsaWVudC0+dXBkYXRlKG11bHRp cGxlLCBzaXplLCBsYWJlbHMsIGVuYWJsZWRzLCBpdGVtVHlwZXMsIHNlbGVjdGVkcywgbV93ZWJQ YWdlLCBzZWxlY3QpOworICAgICAgICBzZWxlY3RDbGllbnQgPSBuZXcgU2VsZWN0UG9wdXBDbGll bnQobXVsdGlwbGUsIHNpemUsIGxhYmVscywgZW5hYmxlZHMsIGl0ZW1UeXBlcywgc2VsZWN0ZWRz LCBtX3dlYlBhZ2UsIHNlbGVjdCk7CiAgICAgfQogCiAgICAgV2ViQ29yZTo6SW50UmVjdCBlbGVt ZW50UmVjdEluUm9vdFZpZXcgPSBzZWxlY3QtPmRvY3VtZW50KCktPnZpZXcoKS0+Y29udGVudHNU b1Jvb3RWaWV3KHNlbGVjdC0+Z2V0UmVjdCgpKTsKLSAgICBtX3dlYlBhZ2UtPm1fcGFnZS0+Y2hy b21lKCktPmNsaWVudCgpLT5vcGVuUGFnZVBvcHVwKG1fc2VsZWN0Q2xpZW50LCBlbGVtZW50UmVj dEluUm9vdFZpZXcpOworICAgIG1fd2ViUGFnZS0+bV9wYWdlLT5jaHJvbWUoKS0+Y2xpZW50KCkt Pm9wZW5QYWdlUG9wdXAoc2VsZWN0Q2xpZW50LCBlbGVtZW50UmVjdEluUm9vdFZpZXcpOwogICAg IHJldHVybiB0cnVlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv V2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9X ZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oCmluZGV4IDI1NmY5ZTQuLmM2MzM0NDcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxl ci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFu ZGxlci5oCkBAIC0zNyw3ICszNyw2IEBAIGNsYXNzIEhUTUxJbnB1dEVsZW1lbnQ7CiBjbGFzcyBI VE1MU2VsZWN0RWxlbWVudDsKIGNsYXNzIEludFJlY3Q7CiBjbGFzcyBOb2RlOwotY2xhc3MgU2Vs ZWN0UG9wdXBDbGllbnQ7CiB9CiAKIG5hbWVzcGFjZSBCbGFja0JlcnJ5IHsKQEAgLTE5Myw4ICsx OTIsNiBAQCBwcml2YXRlOgogCiAgICAgUGVuZGluZ0tleWJvYXJkU3RhdGVDaGFuZ2UgbV9wZW5k aW5nS2V5Ym9hcmRWaXNpYmlsaXR5Q2hhbmdlOwogICAgIGJvb2wgbV9kZWxheUtleWJvYXJkVmlz aWJpbGl0eUNoYW5nZTsKLQotICAgIFdlYkNvcmU6OlNlbGVjdFBvcHVwQ2xpZW50KiBtX3NlbGVj dENsaWVudDsKIH07CiAKIH0KLS0gCjEuNy4xMC4xCgo= 146626 2012-06-08 12:21:29 -0700 2012-06-08 13:00:28 -0700 updated patch 0001-2012-06-08-Crystal-Zhang-haizhang-rim.com.patch text/plain 7425 haizhang RnJvbSAzNjBiMjc5ODAwNzgxMDNhZTM4YTQ4NDE0Nzc4MmZkYzNhZmRhMzBhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDcnlzdGFsIFpoYW5nIDxoYWl6aGFuZ0ByaW0uY29tPgpEYXRl OiBGcmksIDggSnVuIDIwMTIgMTQ6MzA6MjUgLTA0MDAKU3ViamVjdDogW1BBVENIXSAyMDEyLTA2 LTA4ICBDcnlzdGFsIFpoYW5nICA8aGFpemhhbmdAcmltLmNvbT4KCiAgICAgICAgW0JsYWNrQmVy cnldIEZpeCBjcmFzaCBvbiBQYWdlUG9wdXBDaHJvbWVDbGllbnQKICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg2NzUKCiAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCgogICAgICAgIFBSIDE2MzY3Mi4KCiAgICAgICAgQWN0dWFsbHkgaXQn cyB0aGUgYnVnIGluc2lkZSBJbnB1dEhhbmRsZXIsIHNob3VsZCBkZWxldGUgdGhlIG9sZCBwb3B1 cCBhbmQgY3JlYXRlIGEgbmV3IG9uZSwKICAgICAgICBiZWNhdXNlIHVwZGF0ZSgpIGlzIHByb2Js ZW1hdGljLiBBbHNvIG5vIG5lZWQgdG8gc2F2ZSBwb2ludGVyIGluIElucHV0SGFuZGxlci4KCiAg ICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcDoKICAgICAg ICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50QmxhY2tCZXJyeTo6b3BlblBhZ2VQb3B1cCk6CiAgICAg ICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudEJsYWNrQmVycnk6OmNsb3NlUGFnZVBvcHVwKToKICAg ICAgICAqIFdlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcDoKICAgICAgICAoQmxhY2tCZXJy eTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OklucHV0SGFuZGxlcik6CiAgICAgICAgKEJsYWNrQmVy cnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjp+SW5wdXRIYW5kbGVyKToKICAgICAgICAoQmxhY2tC ZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6Om9wZW5TZWxlY3RQb3B1cCk6CiAgICAgICAgKiBX ZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oOgogICAgICAgIChXZWJDb3JlKToKICAgICAgICAo SW5wdXRIYW5kbGVyKToKLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICB8ICAgMjMgKysrKysrKysrKysrKysKIC4uLi9XZWJDb3JlU3VwcG9ydC9D aHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcCAgICAgIHwgICAxMyArKystLS0tLQogLi4uL2JsYWNr YmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwICAgICAgfCAgIDMzICsrKysrKysr KystLS0tLS0tLS0tCiAuLi4vV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhh bmRsZXIuaCB8ICAgIDMgLS0KIDQgZmlsZXMgY2hhbmdlZCwgNDMgaW5zZXJ0aW9ucygrKSwgMjkg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggOTk5ZTlhYS4u NDgxMjFmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAK KzIwMTItMDYtMDggIENyeXN0YWwgWmhhbmcgIDxoYWl6aGFuZ0ByaW0uY29tPgorCisgICAgICAg IFtCbGFja0JlcnJ5XSBGaXggY3Jhc2ggb24gUGFnZVBvcHVwQ2hyb21lQ2xpZW50CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODY3NQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBSIDE2MzY3Mi4KKworICAg ICAgICBBY3R1YWxseSBpdCdzIHRoZSBidWcgaW5zaWRlIElucHV0SGFuZGxlciwgc2hvdWxkIGRl bGV0ZSB0aGUgb2xkIHBvcHVwIGFuZCBjcmVhdGUgYSBuZXcgb25lLAorICAgICAgICBiZWNhdXNl IHVwZGF0ZSgpIGlzIHByb2JsZW1hdGljLiBBbHNvIG5vIG5lZWQgdG8gc2F2ZSBwb2ludGVyIGlu IElucHV0SGFuZGxlci4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJs YWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50QmxhY2tCZXJyeTo6 b3BlblBhZ2VQb3B1cCk6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRCbGFja0JlcnJ5 OjpjbG9zZVBhZ2VQb3B1cCk6CisgICAgICAgICogV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIu Y3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OklucHV0SGFu ZGxlcik6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6fklucHV0 SGFuZGxlcik6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6b3Bl blNlbGVjdFBvcHVwKToKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oOgor ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChJbnB1dEhhbmRsZXIpOgorCiAyMDEyLTA2LTA3 ICBDcnlzdGFsIFpoYW5nICA8aGFpemhhbmdAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJy eV0gU2hvdWxkIFVzZSB0aGUgV2ViUGFnZSBBbHJlYWR5IENyZWF0ZWQgYnkgQ2xpZW50LCBObyBO ZWVkIHRvIENyZWF0ZSBOZXcgT25lLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3Bw CmluZGV4IGYyZDAxYjMuLmZiMDk5OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJy eS5jcHAKQEAgLTMwMywyMiArMzAzLDE3IEBAIFBhZ2VQb3B1cCogQ2hyb21lQ2xpZW50QmxhY2tC ZXJyeTo6b3BlblBhZ2VQb3B1cChQYWdlUG9wdXBDbGllbnQqIGNsaWVudCwgY29uc3QKIHsKICAg ICBQYWdlUG9wdXBCbGFja0JlcnJ5KiB3ZWJQb3B1cDsKIAotICAgIGlmICghaGFzT3BlbmVkUG9w dXAoKSkgewotICAgICAgICB3ZWJQb3B1cCA9IG5ldyBQYWdlUG9wdXBCbGFja0JlcnJ5KG1fd2Vi UGFnZVByaXZhdGUsIGNsaWVudCwKLSAgICAgICAgICAgICAgICByb290Vmlld1RvU2NyZWVuKG9y aWdpbkJvdW5kc0luUm9vdFZpZXcpKTsKLSAgICAgICAgbV93ZWJQYWdlUHJpdmF0ZS0+bV93ZWJQ YWdlLT5wb3B1cE9wZW5lZCh3ZWJQb3B1cCk7Ci0gICAgfSBlbHNlCi0gICAgICAgIHdlYlBvcHVw ID0gbV93ZWJQYWdlUHJpdmF0ZS0+bV93ZWJQYWdlLT5wb3B1cCgpOworICAgIGlmIChoYXNPcGVu ZWRQb3B1cCgpKQorICAgICAgICBjbG9zZVBhZ2VQb3B1cCgwKTsKIAorICAgIHdlYlBvcHVwID0g bmV3IFBhZ2VQb3B1cEJsYWNrQmVycnkobV93ZWJQYWdlUHJpdmF0ZSwgY2xpZW50LCByb290Vmll d1RvU2NyZWVuKG9yaWdpbkJvdW5kc0luUm9vdFZpZXcpKTsKKyAgICBtX3dlYlBhZ2VQcml2YXRl LT5tX3dlYlBhZ2UtPnBvcHVwT3BlbmVkKHdlYlBvcHVwKTsKICAgICB3ZWJQb3B1cC0+c2VuZENy ZWF0ZVBvcHVwV2ViVmlld1JlcXVlc3QoKTsKICAgICByZXR1cm4gd2ViUG9wdXA7CiB9CiAKIHZv aWQgQ2hyb21lQ2xpZW50QmxhY2tCZXJyeTo6Y2xvc2VQYWdlUG9wdXAoUGFnZVBvcHVwKiBwb3B1 cCkKIHsKLSAgICBpZiAoIXBvcHVwKQotICAgICAgICByZXR1cm47Ci0KICAgICBQYWdlUG9wdXBC bGFja0JlcnJ5KiB3ZWJQb3B1cCA9IG1fd2ViUGFnZVByaXZhdGUtPm1fd2ViUGFnZS0+cG9wdXAo KTsKICAgICB3ZWJQb3B1cC0+Y2xvc2VQb3B1cCgpOwogICAgIG1fd2ViUGFnZVByaXZhdGUtPm1f d2ViUGFnZS0+cG9wdXBDbG9zZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwCmluZGV4IDk1Yjk3YjIuLjA3NTZk YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lu cHV0SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBv cnQvSW5wdXRIYW5kbGVyLmNwcApAQCAtMTIwLDEzICsxMjAsMTMgQEAgSW5wdXRIYW5kbGVyOjpJ bnB1dEhhbmRsZXIoV2ViUGFnZVByaXZhdGUqIHBhZ2UpCiAgICAgLCBtX2NvbXBvc2luZ1RleHRF bmQoMCkKICAgICAsIG1fcGVuZGluZ0tleWJvYXJkVmlzaWJpbGl0eUNoYW5nZShOb0NoYW5nZSkK ICAgICAsIG1fZGVsYXlLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UoZmFsc2UpCi0gICAgLCBtX3Nl bGVjdENsaWVudCgwKQogewogfQogCiBJbnB1dEhhbmRsZXI6On5JbnB1dEhhbmRsZXIoKQogewot ICAgIGRlbGV0ZSBtX3NlbGVjdENsaWVudDsKKyAgICBpZiAobV93ZWJQYWdlLT5tX3dlYlBhZ2Ut Pmhhc09wZW5lZFBvcHVwKCkpCisgICAgICAgIG1fd2ViUGFnZS0+bV9wYWdlLT5jaHJvbWUoKS0+ Y2xpZW50KCktPmNsb3NlUGFnZVBvcHVwKDApOwogfQogCiBzdGF0aWMgQmxhY2tCZXJyeUlucHV0 VHlwZSBjb252ZXJ0SW5wdXRUeXBlKGNvbnN0IEhUTUxJbnB1dEVsZW1lbnQqIGlucHV0RWxlbWVu dCkKQEAgLTExNDIsMTYgKzExNDIsMTkgQEAgYm9vbCBJbnB1dEhhbmRsZXI6Om9wZW5TZWxlY3RQ b3B1cChIVE1MU2VsZWN0RWxlbWVudCogc2VsZWN0KQogICAgIFNjb3BlQXJyYXk8V2ViU3RyaW5n PiBsYWJlbHM7CiAgICAgbGFiZWxzLnJlc2V0KG5ldyBXZWJTdHJpbmdbc2l6ZV0pOwogCi0gICAg aWYgKCFzaXplKSB7Ci0gICAgICAgIGlmICghbV9zZWxlY3RDbGllbnQpCi0gICAgICAgICAgICBt X3NlbGVjdENsaWVudCA9IG5ldyBTZWxlY3RQb3B1cENsaWVudChtdWx0aXBsZSwgc2l6ZSwgbGFi ZWxzLCAwLCAwLCAwLCBtX3dlYlBhZ2UsIHNlbGVjdCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAg ICAgIG1fc2VsZWN0Q2xpZW50LT51cGRhdGUobXVsdGlwbGUsIHNpemUsIGxhYmVscywgZW5hYmxl ZHMsIGl0ZW1UeXBlcywgc2VsZWN0ZWRzLCBtX3dlYlBhZ2UsIHNlbGVjdCk7Ci0gICAgfSBlbHNl IHsKLSAgICAgICAgYm9vbCogZW5hYmxlZHMgPSBuZXcgYm9vbFtzaXplXTsKLSAgICAgICAgaW50 KiBpdGVtVHlwZXMgPSBuZXcgaW50W3NpemVdOwotICAgICAgICBib29sKiBzZWxlY3RlZHMgPSBu ZXcgYm9vbFtzaXplXTsKKyAgICBTZWxlY3RQb3B1cENsaWVudCogc2VsZWN0Q2xpZW50ID0gMDsK KworICAgIGlmIChtX3dlYlBhZ2UtPm1fd2ViUGFnZS0+aGFzT3BlbmVkUG9wdXAoKSkKKyAgICAg ICAgbV93ZWJQYWdlLT5tX3BhZ2UtPmNocm9tZSgpLT5jbGllbnQoKS0+Y2xvc2VQYWdlUG9wdXAo MCk7CiAKKyAgICBib29sKiBlbmFibGVkcyA9IDA7CisgICAgaW50KiBpdGVtVHlwZXMgPSAwOwor ICAgIGJvb2wqIHNlbGVjdGVkcyA9IDA7CisKKyAgICBpZiAoc2l6ZSkgeworICAgICAgICBlbmFi bGVkcyA9IG5ldyBib29sW3NpemVdOworICAgICAgICBpdGVtVHlwZXMgPSBuZXcgaW50W3NpemVd OworICAgICAgICBzZWxlY3RlZHMgPSBuZXcgYm9vbFtzaXplXTsKICAgICAgICAgZm9yIChpbnQg aSA9IDA7IGkgPCBzaXplOyBpKyspIHsKICAgICAgICAgICAgIGlmIChsaXN0SXRlbXNbaV0tPmhh c1RhZ05hbWUoSFRNTE5hbWVzOjpvcHRpb25UYWcpKSB7CiAgICAgICAgICAgICAgICAgSFRNTE9w dGlvbkVsZW1lbnQqIG9wdGlvbiA9IHN0YXRpY19jYXN0PEhUTUxPcHRpb25FbGVtZW50Kj4obGlz dEl0ZW1zW2ldKTsKQEAgLTExNzEsMTUgKzExNzQsMTEgQEAgYm9vbCBJbnB1dEhhbmRsZXI6Om9w ZW5TZWxlY3RQb3B1cChIVE1MU2VsZWN0RWxlbWVudCogc2VsZWN0KQogICAgICAgICAgICAgICAg IGl0ZW1UeXBlc1tpXSA9IFR5cGVTZXBhcmF0b3I7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0K LQotICAgICAgICBpZiAoIW1fc2VsZWN0Q2xpZW50KQotICAgICAgICAgICAgbV9zZWxlY3RDbGll bnQgPSBuZXcgU2VsZWN0UG9wdXBDbGllbnQobXVsdGlwbGUsIHNpemUsIGxhYmVscywgZW5hYmxl ZHMsIGl0ZW1UeXBlcywgc2VsZWN0ZWRzLCBtX3dlYlBhZ2UsIHNlbGVjdCk7Ci0gICAgICAgIGVs c2UKLSAgICAgICAgICAgIG1fc2VsZWN0Q2xpZW50LT51cGRhdGUobXVsdGlwbGUsIHNpemUsIGxh YmVscywgZW5hYmxlZHMsIGl0ZW1UeXBlcywgc2VsZWN0ZWRzLCBtX3dlYlBhZ2UsIHNlbGVjdCk7 CiAgICAgfQogCisgICAgc2VsZWN0Q2xpZW50ID0gbmV3IFNlbGVjdFBvcHVwQ2xpZW50KG11bHRp cGxlLCBzaXplLCBsYWJlbHMsIGVuYWJsZWRzLCBpdGVtVHlwZXMsIHNlbGVjdGVkcywgbV93ZWJQ YWdlLCBzZWxlY3QpOwogICAgIFdlYkNvcmU6OkludFJlY3QgZWxlbWVudFJlY3RJblJvb3RWaWV3 ID0gc2VsZWN0LT5kb2N1bWVudCgpLT52aWV3KCktPmNvbnRlbnRzVG9Sb290VmlldyhzZWxlY3Qt PmdldFJlY3QoKSk7Ci0gICAgbV93ZWJQYWdlLT5tX3BhZ2UtPmNocm9tZSgpLT5jbGllbnQoKS0+ b3BlblBhZ2VQb3B1cChtX3NlbGVjdENsaWVudCwgZWxlbWVudFJlY3RJblJvb3RWaWV3KTsKKyAg ICBtX3dlYlBhZ2UtPm1fcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5vcGVuUGFnZVBvcHVwKHNl bGVjdENsaWVudCwgZWxlbWVudFJlY3RJblJvb3RWaWV3KTsKICAgICByZXR1cm4gdHJ1ZTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5w dXRIYW5kbGVyLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1 dEhhbmRsZXIuaAppbmRleCAyNTZmOWU0Li5jNjMzNDQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaApAQCAtMzcsNyAr MzcsNiBAQCBjbGFzcyBIVE1MSW5wdXRFbGVtZW50OwogY2xhc3MgSFRNTFNlbGVjdEVsZW1lbnQ7 CiBjbGFzcyBJbnRSZWN0OwogY2xhc3MgTm9kZTsKLWNsYXNzIFNlbGVjdFBvcHVwQ2xpZW50Owog fQogCiBuYW1lc3BhY2UgQmxhY2tCZXJyeSB7CkBAIC0xOTMsOCArMTkyLDYgQEAgcHJpdmF0ZToK IAogICAgIFBlbmRpbmdLZXlib2FyZFN0YXRlQ2hhbmdlIG1fcGVuZGluZ0tleWJvYXJkVmlzaWJp bGl0eUNoYW5nZTsKICAgICBib29sIG1fZGVsYXlLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2U7Ci0K LSAgICBXZWJDb3JlOjpTZWxlY3RQb3B1cENsaWVudCogbV9zZWxlY3RDbGllbnQ7CiB9OwogCiB9 Ci0tIAoxLjcuMTAuMQoK 146631 2012-06-08 13:00:28 -0700 2012-06-08 17:12:32 -0700 updated patch 0001-2012-06-08-Crystal-Zhang-haizhang-rim.com.patch text/plain 7785 haizhang RnJvbSA4MmI4MTFlZDNmMDkwNWU1NzNlMjlmMmQyNmQyYzRhYzQzZTBjZDAyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDcnlzdGFsIFpoYW5nIDxoYWl6aGFuZ0ByaW0uY29tPgpEYXRl OiBGcmksIDggSnVuIDIwMTIgMTQ6MzA6MjUgLTA0MDAKU3ViamVjdDogW1BBVENIXSAyMDEyLTA2 LTA4ICBDcnlzdGFsIFpoYW5nICA8aGFpemhhbmdAcmltLmNvbT4KCiAgICAgICAgW0JsYWNrQmVy cnldIEZpeCBjcmFzaCBvbiBQYWdlUG9wdXBDaHJvbWVDbGllbnQKICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg2NzUKCiAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCgogICAgICAgIFBSIDE2MzY3Mi4KCiAgICAgICAgQWN0dWFsbHkgaXQn cyB0aGUgYnVnIGluc2lkZSBJbnB1dEhhbmRsZXIsIHNob3VsZCBkZWxldGUgdGhlIG9sZCBwb3B1 cCBhbmQgY3JlYXRlIGEgbmV3IG9uZSwKICAgICAgICBiZWNhdXNlIHVwZGF0ZSgpIGlzIHByb2Js ZW1hdGljLiBBbHNvIG5vIG5lZWQgdG8gc2F2ZSBwb2ludGVyIGluIElucHV0SGFuZGxlci4KCiAg ICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcDoKICAgICAg ICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50QmxhY2tCZXJyeTo6b3BlblBhZ2VQb3B1cCk6CiAgICAg ICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudEJsYWNrQmVycnk6OmNsb3NlUGFnZVBvcHVwKToKICAg ICAgICAqIFdlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcDoKICAgICAgICAoQmxhY2tCZXJy eTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OklucHV0SGFuZGxlcik6CiAgICAgICAgKEJsYWNrQmVy cnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjp+SW5wdXRIYW5kbGVyKToKICAgICAgICAoQmxhY2tC ZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6Om9wZW5TZWxlY3RQb3B1cCk6CiAgICAgICAgKiBX ZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oOgogICAgICAgIChXZWJDb3JlKToKICAgICAgICAo SW5wdXRIYW5kbGVyKToKLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICB8ICAgMjMgKysrKysrKysrKysrKysrCiAuLi4vV2ViQ29yZVN1cHBvcnQv Q2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHAgICAgICB8ICAgMjQgKysrKysrLS0tLS0tLS0tLQog Li4uL2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwICAgICAgfCAgIDMw ICsrKysrKysrKy0tLS0tLS0tLS0tCiAuLi4vV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9y dC9JbnB1dEhhbmRsZXIuaCB8ICAgIDMgLS0KIDQgZmlsZXMgY2hhbmdlZCwgNDUgaW5zZXJ0aW9u cygrKSwgMzUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXgg OTk5ZTlhYS4uNDgxMjFmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjYgQEAKKzIwMTItMDYtMDggIENyeXN0YWwgWmhhbmcgIDxoYWl6aGFuZ0ByaW0uY29tPgor CisgICAgICAgIFtCbGFja0JlcnJ5XSBGaXggY3Jhc2ggb24gUGFnZVBvcHVwQ2hyb21lQ2xpZW50 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODY3NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBSIDE2MzY3 Mi4KKworICAgICAgICBBY3R1YWxseSBpdCdzIHRoZSBidWcgaW5zaWRlIElucHV0SGFuZGxlciwg c2hvdWxkIGRlbGV0ZSB0aGUgb2xkIHBvcHVwIGFuZCBjcmVhdGUgYSBuZXcgb25lLAorICAgICAg ICBiZWNhdXNlIHVwZGF0ZSgpIGlzIHByb2JsZW1hdGljLiBBbHNvIG5vIG5lZWQgdG8gc2F2ZSBw b2ludGVyIGluIElucHV0SGFuZGxlci4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9t ZUNsaWVudEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50Qmxh Y2tCZXJyeTo6b3BlblBhZ2VQb3B1cCk6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRC bGFja0JlcnJ5OjpjbG9zZVBhZ2VQb3B1cCk6CisgICAgICAgICogV2ViS2l0U3VwcG9ydC9JbnB1 dEhhbmRsZXIuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6 OklucHV0SGFuZGxlcik6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxl cjo6fklucHV0SGFuZGxlcik6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFu ZGxlcjo6b3BlblNlbGVjdFBvcHVwKToKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0lucHV0SGFu ZGxlci5oOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChJbnB1dEhhbmRsZXIpOgorCiAy MDEyLTA2LTA3ICBDcnlzdGFsIFpoYW5nICA8aGFpemhhbmdAcmltLmNvbT4KIAogICAgICAgICBb QmxhY2tCZXJyeV0gU2hvdWxkIFVzZSB0aGUgV2ViUGFnZSBBbHJlYWR5IENyZWF0ZWQgYnkgQ2xp ZW50LCBObyBOZWVkIHRvIENyZWF0ZSBOZXcgT25lLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwIGIv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNr QmVycnkuY3BwCmluZGV4IGYyZDAxYjMuLmMyYWU0YzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50 QmxhY2tCZXJyeS5jcHAKQEAgLTMwMSwyNyArMzAxLDIxIEBAIFBhc3NSZWZQdHI8U2VhcmNoUG9w dXBNZW51PiBDaHJvbWVDbGllbnRCbGFja0JlcnJ5OjpjcmVhdGVTZWFyY2hQb3B1cE1lbnUoUG9w dXBNCiAKIFBhZ2VQb3B1cCogQ2hyb21lQ2xpZW50QmxhY2tCZXJyeTo6b3BlblBhZ2VQb3B1cChQ YWdlUG9wdXBDbGllbnQqIGNsaWVudCwgY29uc3QgSW50UmVjdCYgb3JpZ2luQm91bmRzSW5Sb290 VmlldykKIHsKLSAgICBQYWdlUG9wdXBCbGFja0JlcnJ5KiB3ZWJQb3B1cDsKLQotICAgIGlmICgh aGFzT3BlbmVkUG9wdXAoKSkgewotICAgICAgICB3ZWJQb3B1cCA9IG5ldyBQYWdlUG9wdXBCbGFj a0JlcnJ5KG1fd2ViUGFnZVByaXZhdGUsIGNsaWVudCwKLSAgICAgICAgICAgICAgICByb290Vmll d1RvU2NyZWVuKG9yaWdpbkJvdW5kc0luUm9vdFZpZXcpKTsKLSAgICAgICAgbV93ZWJQYWdlUHJp dmF0ZS0+bV93ZWJQYWdlLT5wb3B1cE9wZW5lZCh3ZWJQb3B1cCk7Ci0gICAgfSBlbHNlCi0gICAg ICAgIHdlYlBvcHVwID0gbV93ZWJQYWdlUHJpdmF0ZS0+bV93ZWJQYWdlLT5wb3B1cCgpOworICAg IGNsb3NlUGFnZVBvcHVwKDApOwogCisgICAgUGFnZVBvcHVwQmxhY2tCZXJyeSogd2ViUG9wdXAg PSBuZXcgUGFnZVBvcHVwQmxhY2tCZXJyeShtX3dlYlBhZ2VQcml2YXRlLCBjbGllbnQsIHJvb3RW aWV3VG9TY3JlZW4ob3JpZ2luQm91bmRzSW5Sb290VmlldykpOworICAgIG1fd2ViUGFnZVByaXZh dGUtPm1fd2ViUGFnZS0+cG9wdXBPcGVuZWQod2ViUG9wdXApOwogICAgIHdlYlBvcHVwLT5zZW5k Q3JlYXRlUG9wdXBXZWJWaWV3UmVxdWVzdCgpOwogICAgIHJldHVybiB3ZWJQb3B1cDsKIH0KIAot dm9pZCBDaHJvbWVDbGllbnRCbGFja0JlcnJ5OjpjbG9zZVBhZ2VQb3B1cChQYWdlUG9wdXAqIHBv cHVwKQordm9pZCBDaHJvbWVDbGllbnRCbGFja0JlcnJ5OjpjbG9zZVBhZ2VQb3B1cChQYWdlUG9w dXAqKQogewotICAgIGlmICghcG9wdXApCi0gICAgICAgIHJldHVybjsKLQotICAgIFBhZ2VQb3B1 cEJsYWNrQmVycnkqIHdlYlBvcHVwID0gbV93ZWJQYWdlUHJpdmF0ZS0+bV93ZWJQYWdlLT5wb3B1 cCgpOwotICAgIHdlYlBvcHVwLT5jbG9zZVBvcHVwKCk7Ci0gICAgbV93ZWJQYWdlUHJpdmF0ZS0+ bV93ZWJQYWdlLT5wb3B1cENsb3NlZCgpOworICAgIGlmIChoYXNPcGVuZWRQb3B1cCgpKSB7Cisg ICAgICAgIFBhZ2VQb3B1cEJsYWNrQmVycnkqIHdlYlBvcHVwID0gbV93ZWJQYWdlUHJpdmF0ZS0+ bV93ZWJQYWdlLT5wb3B1cCgpOworICAgICAgICB3ZWJQb3B1cC0+Y2xvc2VQb3B1cCgpOworICAg ICAgICBtX3dlYlBhZ2VQcml2YXRlLT5tX3dlYlBhZ2UtPnBvcHVwQ2xvc2VkKCk7CisgICAgfQog fQogCiB2b2lkIENocm9tZUNsaWVudEJsYWNrQmVycnk6OnNldFRvb2xiYXJzVmlzaWJsZShib29s KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5w dXRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lu cHV0SGFuZGxlci5jcHAKaW5kZXggOTViOTdiMi4uOTk0NGE5ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwCkBA IC0xMjAsMTMgKzEyMCwxMiBAQCBJbnB1dEhhbmRsZXI6OklucHV0SGFuZGxlcihXZWJQYWdlUHJp dmF0ZSogcGFnZSkKICAgICAsIG1fY29tcG9zaW5nVGV4dEVuZCgwKQogICAgICwgbV9wZW5kaW5n S2V5Ym9hcmRWaXNpYmlsaXR5Q2hhbmdlKE5vQ2hhbmdlKQogICAgICwgbV9kZWxheUtleWJvYXJk VmlzaWJpbGl0eUNoYW5nZShmYWxzZSkKLSAgICAsIG1fc2VsZWN0Q2xpZW50KDApCiB7CiB9CiAK IElucHV0SGFuZGxlcjo6fklucHV0SGFuZGxlcigpCiB7Ci0gICAgZGVsZXRlIG1fc2VsZWN0Q2xp ZW50OworICAgIG1fd2ViUGFnZS0+bV9wYWdlLT5jaHJvbWUoKS0+Y2xpZW50KCktPmNsb3NlUGFn ZVBvcHVwKDApOwogfQogCiBzdGF0aWMgQmxhY2tCZXJyeUlucHV0VHlwZSBjb252ZXJ0SW5wdXRU eXBlKGNvbnN0IEhUTUxJbnB1dEVsZW1lbnQqIGlucHV0RWxlbWVudCkKQEAgLTExNDIsMTYgKzEx NDEsMTcgQEAgYm9vbCBJbnB1dEhhbmRsZXI6Om9wZW5TZWxlY3RQb3B1cChIVE1MU2VsZWN0RWxl bWVudCogc2VsZWN0KQogICAgIFNjb3BlQXJyYXk8V2ViU3RyaW5nPiBsYWJlbHM7CiAgICAgbGFi ZWxzLnJlc2V0KG5ldyBXZWJTdHJpbmdbc2l6ZV0pOwogCi0gICAgaWYgKCFzaXplKSB7Ci0gICAg ICAgIGlmICghbV9zZWxlY3RDbGllbnQpCi0gICAgICAgICAgICBtX3NlbGVjdENsaWVudCA9IG5l dyBTZWxlY3RQb3B1cENsaWVudChtdWx0aXBsZSwgc2l6ZSwgbGFiZWxzLCAwLCAwLCAwLCBtX3dl YlBhZ2UsIHNlbGVjdCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1fc2VsZWN0Q2xpZW50 LT51cGRhdGUobXVsdGlwbGUsIHNpemUsIGxhYmVscywgZW5hYmxlZHMsIGl0ZW1UeXBlcywgc2Vs ZWN0ZWRzLCBtX3dlYlBhZ2UsIHNlbGVjdCk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgYm9vbCog ZW5hYmxlZHMgPSBuZXcgYm9vbFtzaXplXTsKLSAgICAgICAgaW50KiBpdGVtVHlwZXMgPSBuZXcg aW50W3NpemVdOwotICAgICAgICBib29sKiBzZWxlY3RlZHMgPSBuZXcgYm9vbFtzaXplXTsKKyAg ICAvLyBDaGVjayBpZiBwb3B1cCBhbHJlYWR5IGV4aXN0cywgY2xvc2UgaXQgaWYgZG9lcy4KKyAg ICBtX3dlYlBhZ2UtPm1fcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5jbG9zZVBhZ2VQb3B1cCgw KTsKKworICAgIGJvb2wqIGVuYWJsZWRzID0gMDsKKyAgICBpbnQqIGl0ZW1UeXBlcyA9IDA7Cisg ICAgYm9vbCogc2VsZWN0ZWRzID0gMDsKIAorICAgIGlmIChzaXplKSB7CisgICAgICAgIGVuYWJs ZWRzID0gbmV3IGJvb2xbc2l6ZV07CisgICAgICAgIGl0ZW1UeXBlcyA9IG5ldyBpbnRbc2l6ZV07 CisgICAgICAgIHNlbGVjdGVkcyA9IG5ldyBib29sW3NpemVdOwogICAgICAgICBmb3IgKGludCBp ID0gMDsgaSA8IHNpemU7IGkrKykgewogICAgICAgICAgICAgaWYgKGxpc3RJdGVtc1tpXS0+aGFz VGFnTmFtZShIVE1MTmFtZXM6Om9wdGlvblRhZykpIHsKICAgICAgICAgICAgICAgICBIVE1MT3B0 aW9uRWxlbWVudCogb3B0aW9uID0gc3RhdGljX2Nhc3Q8SFRNTE9wdGlvbkVsZW1lbnQqPihsaXN0 SXRlbXNbaV0pOwpAQCAtMTE3MSwxNSArMTE3MSwxMSBAQCBib29sIElucHV0SGFuZGxlcjo6b3Bl blNlbGVjdFBvcHVwKEhUTUxTZWxlY3RFbGVtZW50KiBzZWxlY3QpCiAgICAgICAgICAgICAgICAg aXRlbVR5cGVzW2ldID0gVHlwZVNlcGFyYXRvcjsKICAgICAgICAgICAgIH0KICAgICAgICAgfQot Ci0gICAgICAgIGlmICghbV9zZWxlY3RDbGllbnQpCi0gICAgICAgICAgICBtX3NlbGVjdENsaWVu dCA9IG5ldyBTZWxlY3RQb3B1cENsaWVudChtdWx0aXBsZSwgc2l6ZSwgbGFiZWxzLCBlbmFibGVk cywgaXRlbVR5cGVzLCBzZWxlY3RlZHMsIG1fd2ViUGFnZSwgc2VsZWN0KTsKLSAgICAgICAgZWxz ZQotICAgICAgICAgICAgbV9zZWxlY3RDbGllbnQtPnVwZGF0ZShtdWx0aXBsZSwgc2l6ZSwgbGFi ZWxzLCBlbmFibGVkcywgaXRlbVR5cGVzLCBzZWxlY3RlZHMsIG1fd2ViUGFnZSwgc2VsZWN0KTsK ICAgICB9CiAKKyAgICBTZWxlY3RQb3B1cENsaWVudCogc2VsZWN0Q2xpZW50ID0gbmV3IFNlbGVj dFBvcHVwQ2xpZW50KG11bHRpcGxlLCBzaXplLCBsYWJlbHMsIGVuYWJsZWRzLCBpdGVtVHlwZXMs IHNlbGVjdGVkcywgbV93ZWJQYWdlLCBzZWxlY3QpOwogICAgIFdlYkNvcmU6OkludFJlY3QgZWxl bWVudFJlY3RJblJvb3RWaWV3ID0gc2VsZWN0LT5kb2N1bWVudCgpLT52aWV3KCktPmNvbnRlbnRz VG9Sb290VmlldyhzZWxlY3QtPmdldFJlY3QoKSk7Ci0gICAgbV93ZWJQYWdlLT5tX3BhZ2UtPmNo cm9tZSgpLT5jbGllbnQoKS0+b3BlblBhZ2VQb3B1cChtX3NlbGVjdENsaWVudCwgZWxlbWVudFJl Y3RJblJvb3RWaWV3KTsKKyAgICBtX3dlYlBhZ2UtPm1fcGFnZS0+Y2hyb21lKCktPmNsaWVudCgp LT5vcGVuUGFnZVBvcHVwKHNlbGVjdENsaWVudCwgZWxlbWVudFJlY3RJblJvb3RWaWV3KTsKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv V2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaAppbmRleCAyNTZmOWU0Li5jNjMzNDQ3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRs ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhh bmRsZXIuaApAQCAtMzcsNyArMzcsNiBAQCBjbGFzcyBIVE1MSW5wdXRFbGVtZW50OwogY2xhc3Mg SFRNTFNlbGVjdEVsZW1lbnQ7CiBjbGFzcyBJbnRSZWN0OwogY2xhc3MgTm9kZTsKLWNsYXNzIFNl bGVjdFBvcHVwQ2xpZW50OwogfQogCiBuYW1lc3BhY2UgQmxhY2tCZXJyeSB7CkBAIC0xOTMsOCAr MTkyLDYgQEAgcHJpdmF0ZToKIAogICAgIFBlbmRpbmdLZXlib2FyZFN0YXRlQ2hhbmdlIG1fcGVu ZGluZ0tleWJvYXJkVmlzaWJpbGl0eUNoYW5nZTsKICAgICBib29sIG1fZGVsYXlLZXlib2FyZFZp c2liaWxpdHlDaGFuZ2U7Ci0KLSAgICBXZWJDb3JlOjpTZWxlY3RQb3B1cENsaWVudCogbV9zZWxl Y3RDbGllbnQ7CiB9OwogCiB9Ci0tIAoxLjcuMTAuMQoK