50023 2010-11-24 07:30:39 -0800 [EFL] Remove adjacent tiles rendering queue 2010-12-13 17:28:44 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 50456 1 abgrilo webkit-unassigned abarth antognolli+webkit commit-queue eric jprvita kenneth kling lucas.de.marchi tonikitoo oldest_to_newest 313288 0 abgrilo 2010-11-24 07:30:39 -0800 [EFL] Remove adjacent tiles rendering queue 313289 1 74758 abgrilo 2010-11-24 07:33:36 -0800 Created attachment 74758 Patch 317522 2 74758 lucas.de.marchi 2010-12-06 03:36:59 -0800 Comment on attachment 74758 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=74758&action=review > WebKit/efl/ChangeLog:7 > + Could you give more details on what exactly you are doing? Is this a fix for a bug? > WebKit/efl/ChangeLog:20 > + And, please, detail the important changes above. 320108 3 76187 abgrilo 2010-12-10 05:46:51 -0800 Created attachment 76187 Patch 321134 4 antognolli+webkit 2010-12-13 08:27:34 -0800 (In reply to comment #3) > Created an attachment (id=76187) [details] > Patch Patch looks good to me. 321137 5 76187 kling 2010-12-13 08:31:13 -0800 Comment on attachment 76187 Patch rs=me 321198 6 76187 commit-queue 2010-12-13 10:09:37 -0800 Comment on attachment 76187 Patch Rejecting attachment 76187 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=eseidel-cq-sl', 'build', '--no-clean', '--no-update', '--build-style=both']" exit_code: 2 Last 500 characters of output: pple.compilers.gcc.4_2 CompileC /Projects/CommitQueue/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/WebViewEventHandling.o /Projects/CommitQueue/WebKit/mac/WebView/WebViewEventHandling.mm normal x86_64 objective-c++ com.apple.compilers.gcc.4_2 CompileC /Projects/CommitQueue/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/WebView.o /Projects/CommitQueue/WebKit/mac/WebView/WebView.mm normal x86_64 objective-c++ com.apple.compilers.gcc.4_2 (41 failures) Full output: http://queues.webkit.org/results/7000098 321287 7 lucas.de.marchi 2010-12-13 11:35:44 -0800 (In reply to comment #6) > (From update of attachment 76187 [details]) > Rejecting attachment 76187 [details] from commit-queue. > > Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=eseidel-cq-sl', 'build', '--no-clean', '--no-update', '--build-style=both']" exit_code: 2 > Last 500 characters of output: > pple.compilers.gcc.4_2 > CompileC /Projects/CommitQueue/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/WebViewEventHandling.o /Projects/CommitQueue/WebKit/mac/WebView/WebViewEventHandling.mm normal x86_64 objective-c++ com.apple.compilers.gcc.4_2 > CompileC /Projects/CommitQueue/WebKitBuild/WebKit.build/Release/WebKit.build/Objects-normal/x86_64/WebView.o /Projects/CommitQueue/WebKit/mac/WebView/WebView.mm normal x86_64 objective-c++ com.apple.compilers.gcc.4_2 > (41 failures) > > I forgot the commit bot does not handle dependencies. Alex, could you rebase your patch and re-send it? 321291 8 eric 2010-12-13 11:39:11 -0800 I'm not sure what you mean by "dependencies". 321310 9 lucas.de.marchi 2010-12-13 12:01:39 -0800 (In reply to comment #8) > I'm not sure what you mean by "dependencies". Sorry, I thought the error was that the patch didn't apply after patch in bug 50456 has landed. Actually the bug was with building mac port. Since this patch does not touch any file other than WebKit/efl/ewk/ewk_tiled_backing_store.c, maybe it's safe to cq+ again? 321346 10 76187 lucas.de.marchi 2010-12-13 12:55:03 -0800 Comment on attachment 76187 Patch let's try again. 321456 11 76187 commit-queue 2010-12-13 15:00:16 -0800 Comment on attachment 76187 Patch Rejecting attachment 76187 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=eseidel-cq-sl', 'build', '--no-clean', '--no-update', '--build-style=both']" exit_code: 2 Last 500 characters of output: l x86_64 c++ com.apple.compilers.gcc.4_2 CompileC /Projects/CommitQueue/WebKitBuild/WebKit2.build/Release/WebKit2.build/Objects-normal/x86_64/WebProcessProxy.o /Projects/CommitQueue/WebKit2/UIProcess/WebProcessProxy.cpp normal x86_64 c++ com.apple.compilers.gcc.4_2 CompileC /Projects/CommitQueue/WebKitBuild/WebKit2.build/Release/WebKit2.build/Objects-normal/x86_64/WebPage.o /Projects/CommitQueue/WebKit2/WebProcess/WebPage/WebPage.cpp normal x86_64 c++ com.apple.compilers.gcc.4_2 (6 failures) Full output: http://queues.webkit.org/results/6938121 321467 12 76187 eric 2010-12-13 15:07:11 -0800 Comment on attachment 76187 Patch Clearly one of the cq nodes is having trouble. Not sure why. 321505 13 76187 commit-queue 2010-12-13 15:44:14 -0800 Comment on attachment 76187 Patch Rejecting attachment 76187 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=eseidel-cq-sl', 'build', '--no-clean', '--no-update', '--build-style=both']" exit_code: 2 Last 500 characters of output: itQueue/WebKitBuild/WebKit2.build/Release/WebKit2.build/Objects-normal/x86_64/AuthenticationChallengeProxy.o /Projects/CommitQueue/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp normal x86_64 c++ com.apple.compilers.gcc.4_2 CompileC /Projects/CommitQueue/WebKitBuild/WebKit2.build/Release/WebKit2.build/Objects-normal/x86_64/WebDatabaseManagerProxy.o /Projects/CommitQueue/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp normal x86_64 c++ com.apple.compilers.gcc.4_2 (13 failures) Full output: http://queues.webkit.org/results/6975095 321507 14 eric 2010-12-13 15:46:56 -0800 I'm really not sure what's going on here. Maybe my commit bot node has been failing constantly for all patches? I'm not sure how this one failed 3 times in a row like that? 321568 15 76187 lucas.de.marchi 2010-12-13 17:28:30 -0800 Comment on attachment 76187 Patch Clearing flags on attachment: 76187 Committed r73990: <http://trac.webkit.org/changeset/73990> 321569 16 lucas.de.marchi 2010-12-13 17:28:44 -0800 All reviewed patches have been landed. Closing bug. 74758 2010-11-24 07:33:36 -0800 2010-12-10 05:46:44 -0800 Patch bug-50023-20101124133334.patch text/plain 9783 abgrilo ZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK aW5kZXggN2ExMmZkN2QxY2E2N2I1NjYyZDZkZjg2ODk2MzAyZmVkMjI0YzVhYS4uYzhlZWU5NmU4 ZWI2YjhjOTIwMzFiOTYxNTQxNjgwMmJhNjIyYTc0NCAxMDA2NDQKLS0tIGEvV2ViS2l0L2VmbC9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAx MC0xMS0yNCAgQWxleCBCcmVkYXJpb2wgR3JpbG8gIDxhYmdyaWxvQHByb2Z1c2lvbi5tb2JpPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBh ZGphY2VudCB0aWxlcyByZW5kZXJpbmcgcXVldWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDAyMworCisgICAgICAgICogZXdrL2V3a190aWxlZF9i YWNraW5nX3N0b3JlLmM6CisgICAgICAgIChfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfcHJlX3Jl bmRlcl9yZXF1ZXN0X2FkZCk6CisgICAgICAgIChfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfcHJl X3JlbmRlcl9yZXF1ZXN0X2ZsdXNoKToKKyAgICAgICAgKF9ld2tfdGlsZWRfYmFja2luZ19zdG9y ZV9wcmVfcmVuZGVyX3JlcXVlc3RfY2xlYXIpOgorICAgICAgICAoX2V3a190aWxlZF9iYWNraW5n X3N0b3JlX3ByZV9yZW5kZXJfcmVxdWVzdF9wcm9jZXNzX3NpbmdsZSk6CisgICAgICAgIChfZXdr X3RpbGVkX2JhY2tpbmdfc3RvcmVfaXRlbV9maWxsKToKKyAgICAgICAgKF9ld2tfdGlsZWRfYmFj a2luZ19zdG9yZV9pdGVtX2FkZCk6CisgICAgICAgIChfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVf aXRlbV9kZWwpOgorICAgICAgICAoX2V3a190aWxlZF9iYWNraW5nX3N0b3JlX3JlY2FsY19yZW5k ZXJlcnMpOgorICAgICAgICAoZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfcHJlX3JlbmRlcl9yZWdp b24pOgorICAgICAgICAoZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfcHJlX3JlbmRlcl9yZWxhdGl2 ZV9yYWRpdXMpOgorICAgICAgICAoZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfcHJlX3JlbmRlcl9j YW5jZWwpOgorCiAyMDEwLTExLTIyICBBbGV4IEdyaWxvICA8YWJncmlsb0Bwcm9mdXNpb24ubW9i aT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KZGlm ZiAtLWdpdCBhL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmMgYi9XZWJL aXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFja2luZ19zdG9yZS5jCmluZGV4IDBlODg5OGJjMDQ5OTY1 NThmYWNjZWJlNWZmOWQ0MDgyNWNmMzc3MTQuLjA1OTJjNTI5ZmYwZTRkODMxZDIzZTg2YmUzY2Yx OTk1ZDg4ZDY3YTIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5n X3N0b3JlLmMKKysrIGIvV2ViS2l0L2VmbC9ld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuYwpA QCAtNjIsNyArNjIsNiBAQCBzdHJ1Y3QgX0V3a19UaWxlZF9CYWNraW5nX1N0b3JlX0l0ZW0gewog ICAgICAgICB1bnNpZ25lZCBsb25nIHJvdywgY29sOwogICAgICAgICBmbG9hdCB6b29tOwogICAg IH0gdXBkYXRlOwotICAgIEV3a19UaWxlZF9CYWNraW5nX1N0b3JlX1ByZV9SZW5kZXJfUmVxdWVz dCAqcHJlX3JlbmRlcjsKICAgICBFaW5hX0Jvb2wgc21vb3RoX3NjYWxlOwogfTsKIApAQCAtNzAs NyArNjksNiBAQCBzdHJ1Y3QgX0V3a19UaWxlZF9CYWNraW5nX1N0b3JlX1ByZV9SZW5kZXJfUmVx dWVzdCB7CiAgICAgRUlOQV9JTkxJU1Q7CiAgICAgdW5zaWduZWQgbG9uZyBjb2wsIHJvdzsKICAg ICBmbG9hdCB6b29tOwotICAgIHN0cnVjdCBfRXdrX1RpbGVkX0JhY2tpbmdfU3RvcmVfSXRlbSAq aXQ7CiB9OwogCiBzdHJ1Y3QgX0V3a19UaWxlZF9CYWNraW5nX1N0b3JlX0RhdGEgewpAQCAtMjY2 LDcgKzI2NCw3IEBAIHN0YXRpYyB2b2lkIF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV90aWxlX2Rp c3NvY2lhdGVfYWxsKEV3a19UaWxlZF9CYWNraW5nX1N0b3JlCiAgICAgfQogfQogCi1zdGF0aWMg aW5saW5lIEVpbmFfQm9vbCBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfcHJlX3JlbmRlcl9yZXF1 ZXN0X2FkZChFd2tfVGlsZWRfQmFja2luZ19TdG9yZV9EYXRhICpwcml2LCB1bnNpZ25lZCBsb25n IGNvbCwgdW5zaWduZWQgbG9uZyByb3csIGZsb2F0IHpvb20sIEV3a19UaWxlZF9CYWNraW5nX1N0 b3JlX0l0ZW0gKml0LCBFd2tfVGlsZWRfQmFja2luZ19TdG9yZV9QcmVfUmVuZGVyX1ByaW9yaXR5 IHByaW9yaXR5KQorc3RhdGljIGlubGluZSBFaW5hX0Jvb2wgX2V3a190aWxlZF9iYWNraW5nX3N0 b3JlX3ByZV9yZW5kZXJfcmVxdWVzdF9hZGQoRXdrX1RpbGVkX0JhY2tpbmdfU3RvcmVfRGF0YSAq cHJpdiwgdW5zaWduZWQgbG9uZyBjb2wsIHVuc2lnbmVkIGxvbmcgcm93LCBmbG9hdCB6b29tLCBF d2tfVGlsZWRfQmFja2luZ19TdG9yZV9QcmVfUmVuZGVyX1ByaW9yaXR5IHByaW9yaXR5KQogewog ICAgIEV3a19UaWxlZF9CYWNraW5nX1N0b3JlX1ByZV9SZW5kZXJfUmVxdWVzdCAqcjsKIApAQCAt MjgyLDEwICsyODAsNyBAQCBzdGF0aWMgaW5saW5lIEVpbmFfQm9vbCBfZXdrX3RpbGVkX2JhY2tp bmdfc3RvcmVfcHJlX3JlbmRlcl9yZXF1ZXN0X2FkZChFd2tfVGlsZQogICAgIHItPmNvbCA9IGNv bDsKICAgICByLT5yb3cgPSByb3c7CiAgICAgci0+em9vbSA9IHpvb207Ci0gICAgci0+aXQgPSBp dDsKIAotICAgIGlmIChpdCkKLSAgICAgICAgaXQtPnByZV9yZW5kZXIgPSByOwogICAgIHJldHVy biBFSU5BX1RSVUU7CiB9CiAKQEAgLTMwOSwxNCArMzA0LDEyIEBAIHN0YXRpYyB2b2lkIF9ld2tf dGlsZWRfYmFja2luZ19zdG9yZV9wcmVfcmVuZGVyX3JlcXVlc3RfZmx1c2goRXdrX1RpbGVkX0Jh Y2tpbmdfCiAgICAgd2hpbGUgKCpwbCkgewogICAgICAgICBFd2tfVGlsZWRfQmFja2luZ19TdG9y ZV9QcmVfUmVuZGVyX1JlcXVlc3QgKnI7CiAgICAgICAgIHIgPSBfZXdrX3RpbGVkX2JhY2tpbmdf c3RvcmVfcHJlX3JlbmRlcl9yZXF1ZXN0X2ZpcnN0KHByaXYpOwotICAgICAgICBpZiAoci0+aXQg JiYgci0+aXQtPnByZV9yZW5kZXIpCi0gICAgICAgICAgICByLT5pdC0+cHJlX3JlbmRlciA9IE5V TEw7CiAgICAgICAgICpwbCA9IGVpbmFfaW5saXN0X3JlbW92ZSgqcGwsICpwbCk7CiAgICAgICAg IGZyZWUocik7CiAgICAgfQogfQogCi1zdGF0aWMgdm9pZCBfZXdrX3RpbGVkX2JhY2tpbmdfc3Rv cmVfcHJlX3JlbmRlcl9yZXF1ZXN0X3JlbW92ZV91bmFzc29jaWF0ZWQoRXdrX1RpbGVkX0JhY2tp bmdfU3RvcmVfRGF0YSAqcHJpdikKK3N0YXRpYyB2b2lkIF9ld2tfdGlsZWRfYmFja2luZ19zdG9y ZV9wcmVfcmVuZGVyX3JlcXVlc3RfY2xlYXIoRXdrX1RpbGVkX0JhY2tpbmdfU3RvcmVfRGF0YSAq cHJpdikKIHsKICAgICBFaW5hX0lubGlzdCAqKnBsID0gJnByaXYtPnJlbmRlci5wcmVfcmVuZGVy X3JlcXVlc3RzOwogICAgIEVpbmFfSW5saXN0ICppdGVyID0gKnBsLCAqdG1wOwpAQCAtMzI0LDMz ICszMTcsMTAgQEAgc3RhdGljIHZvaWQgX2V3a190aWxlZF9iYWNraW5nX3N0b3JlX3ByZV9yZW5k ZXJfcmVxdWVzdF9yZW1vdmVfdW5hc3NvY2lhdGVkKEV3a18KICAgICAgICAgRXdrX1RpbGVkX0Jh Y2tpbmdfU3RvcmVfUHJlX1JlbmRlcl9SZXF1ZXN0ICpyID0KICAgICAgICAgICAgIEVJTkFfSU5M SVNUX0NPTlRBSU5FUl9HRVQoCiAgICAgICAgICAgICAgICAgaXRlciwgRXdrX1RpbGVkX0JhY2tp bmdfU3RvcmVfUHJlX1JlbmRlcl9SZXF1ZXN0KTsKLSAgICAgICAgaWYgKCFyLT5pdCkgewotICAg ICAgICAgICAgdG1wID0gaXRlci0+bmV4dDsKLSAgICAgICAgICAgICpwbCA9IGVpbmFfaW5saXN0 X3JlbW92ZSgqcGwsIGl0ZXIpOwotICAgICAgICAgICAgaXRlciA9IHRtcDsKLSAgICAgICAgICAg IGZyZWUocik7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgaXRlciA9IGl0ZXItPm5leHQ7 Ci0gICAgfQotfQotCi1zdGF0aWMgdm9pZCBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfcHJlX3Jl bmRlcl9yZXF1ZXN0X3JlbW92ZV9hc3NvY2lhdGVkKEV3a19UaWxlZF9CYWNraW5nX1N0b3JlX0Rh dGEgKnByaXYpCi17Ci0gICAgRWluYV9Jbmxpc3QgKipwbCA9ICZwcml2LT5yZW5kZXIucHJlX3Jl bmRlcl9yZXF1ZXN0czsKLSAgICBFaW5hX0lubGlzdCAqaXRlciA9ICpwbCwgKnRtcDsKLSAgICB3 aGlsZSAoaXRlcikgewotICAgICAgICBFd2tfVGlsZWRfQmFja2luZ19TdG9yZV9QcmVfUmVuZGVy X1JlcXVlc3QgKnIgPQotICAgICAgICAgICAgRUlOQV9JTkxJU1RfQ09OVEFJTkVSX0dFVCgKLSAg ICAgICAgICAgICAgICBpdGVyLCBFd2tfVGlsZWRfQmFja2luZ19TdG9yZV9QcmVfUmVuZGVyX1Jl cXVlc3QpOwotICAgICAgICBpZiAoci0+aXQpIHsKLSAgICAgICAgICAgIGlmIChyLT5pdC0+cHJl X3JlbmRlcikKLSAgICAgICAgICAgICAgICByLT5pdC0+cHJlX3JlbmRlciA9IE5VTEw7Ci0gICAg ICAgICAgICB0bXAgPSBpdGVyLT5uZXh0OwotICAgICAgICAgICAgKnBsID0gZWluYV9pbmxpc3Rf cmVtb3ZlKCpwbCwgaXRlcik7Ci0gICAgICAgICAgICBpdGVyID0gdG1wOwotICAgICAgICAgICAg ZnJlZShyKTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBpdGVyID0gaXRlci0+bmV4dDsK KyAgICAgICAgdG1wID0gaXRlci0+bmV4dDsKKyAgICAgICAgKnBsID0gZWluYV9pbmxpc3RfcmVt b3ZlKCpwbCwgaXRlcik7CisgICAgICAgIGl0ZXIgPSB0bXA7CisgICAgICAgIGZyZWUocik7CiAg ICAgfQogfQogCkBAIC0zNzksMTEgKzM0OSw2IEBAIHN0YXRpYyB2b2lkIF9ld2tfdGlsZWRfYmFj a2luZ19zdG9yZV9wcmVfcmVuZGVyX3JlcXVlc3RfcHJvY2Vzc19zaW5nbGUoRXdrX1RpbGVkCiAg ICAgICAgIGdvdG8gZW5kOwogICAgIH0KIAotICAgIGlmIChyZXEtPml0ICYmIHJlcS0+aXQtPnRp bGUpIHsKLSAgICAgICAgQ1JJVElDQUwoIml0LT50aWxlID0gJXAgKCVsdSwgJWx1KSwgYnV0IHNo b3VsZCBiZSBOVUxMIiwgcmVxLT5pdC0+dGlsZSwgcmVxLT5pdC0+dGlsZS0+cm93LCByZXEtPml0 LT50aWxlLT5jb2wpOwotICAgICAgICBnb3RvIGVuZDsKLSAgICB9Ci0KICAgICB0ID0gX2V3a190 aWxlZF9iYWNraW5nX3N0b3JlX3RpbGVfbmV3KHByaXYsIGNvbCwgcm93LCB6b29tKTsKICAgICBp ZiAoIXQpCiAgICAgICAgIGdvdG8gZW5kOwpAQCAtMzk5LDEyICszNjQsNyBAQCBzdGF0aWMgdm9p ZCBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfcHJlX3JlbmRlcl9yZXF1ZXN0X3Byb2Nlc3Nfc2lu Z2xlKEV3a19UaWxlZAogICAgICAgICBhcmVhLngsIGFyZWEueSwgYXJlYS53LCBhcmVhLmgpOwog ICAgIGV3a190aWxlX21hdHJpeF90aWxlX3VwZGF0ZXNfY2xlYXIodG0sIHQpOwogCi0gICAgaWYg KHJlcS0+aXQpIHsKLSAgICAgICAgX2V3a190aWxlZF9iYWNraW5nX3N0b3JlX3RpbGVfYXNzb2Np YXRlKHByaXYsIHQsIHJlcS0+aXQpOwotICAgICAgICBpZiAocmVxLT5pdC0+cHJlX3JlbmRlcikK LSAgICAgICAgICAgIHJlcS0+aXQtPnByZV9yZW5kZXIgPSBOVUxMOwotICAgIH0gZWxzZQotICAg ICAgICBld2tfdGlsZV9tYXRyaXhfdGlsZV9wdXQodG0sIHQsIGxhc3RfdXNlZCk7CisgICAgZXdr X3RpbGVfbWF0cml4X3RpbGVfcHV0KHRtLCB0LCBsYXN0X3VzZWQpOwogCiBlbmQ6CiAgICAgX2V3 a190aWxlZF9iYWNraW5nX3N0b3JlX3ByZV9yZW5kZXJfcmVxdWVzdF9kZWwocHJpdiwgcmVxKTsK QEAgLTYxMCwxMiArNTcwLDYgQEAgc3RhdGljIGlubGluZSBFaW5hX0Jvb2wgX2V3a190aWxlZF9i YWNraW5nX3N0b3JlX2l0ZW1fZmlsbChFd2tfVGlsZWRfQmFja2luZ19TdG8KICAgICAgICAgICAg IF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV9pdGVtX3JlcXVlc3RfZGVsKHByaXYsIGl0KTsKICAg ICAgICAgfQogCi0gICAgICAgIGlmIChpdC0+cHJlX3JlbmRlcikgewotICAgICAgICAgICAgX2V3 a190aWxlZF9iYWNraW5nX3N0b3JlX3ByZV9yZW5kZXJfcmVxdWVzdF9kZWwoCi0gICAgICAgICAg ICAgICAgcHJpdiwgaXQtPnByZV9yZW5kZXIpOwotICAgICAgICAgICAgaXQtPnByZV9yZW5kZXIg PSBOVUxMOwotICAgICAgICB9Ci0KICAgICAgICAgaWYgKGl0LT50aWxlKSB7CiAgICAgICAgICAg ICBFd2tfVGlsZSAqb2xkID0gaXQtPnRpbGU7CiAgICAgICAgICAgICBpZiAob2xkLT5yb3cgIT0g bV9yb3cgfHwgb2xkLT5jb2wgIT0gbV9jb2wgfHwgb2xkLT56b29tICE9IHpvb20pIHsKQEAgLTY0 MCwxOSArNTk0LDYgQEAgc3RhdGljIGlubGluZSBFaW5hX0Jvb2wgX2V3a190aWxlZF9iYWNraW5n X3N0b3JlX2l0ZW1fZmlsbChFd2tfVGlsZWRfQmFja2luZ19TdG8KIAogICAgICAgICAgICAgLyog RG8gbm90IGFkZCBuZXcgcmVxdWVzdHMgdG8gdGhlIHJlbmRlciBxdWV1ZSAqLwogICAgICAgICAg ICAgaWYgKCFwcml2LT5yZW5kZXIuc3VzcGVuZCkgewotICAgICAgICAgICAgICAgIGlmICghX2V3 a190aWxlZF9iYWNraW5nX3N0b3JlX3RpbGVfaXNfaW5zaWRlX3ZpZXdwb3J0KAotICAgICAgICAg ICAgICAgICAgICAgICAgcHJpdiwgbV9jb2wsIG1fcm93KSkgewotICAgICAgICAgICAgICAgICAg ICBEQkcoIiVkLCVkIGlzIG5vdCBpbnNpZGUgdGhlIHZpZXdwb3J0IiwgbV9jb2wsIG1fcm93KTsK LSAgICAgICAgICAgICAgICAgICAgaWYgKF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV90aWxlX2lz X2FkamFjZW50X3RvX3ZpZXdwb3J0KAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByaXYs IG1fY29sLCBtX3JvdykpCi0gICAgICAgICAgICAgICAgICAgICAgICBfZXdrX3RpbGVkX2JhY2tp bmdfc3RvcmVfcHJlX3JlbmRlcl9yZXF1ZXN0X2FkZCgKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwcml2LCBtX2NvbCwgbV9yb3csIHpvb20sIGl0LAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFBSRV9SRU5ERVJfUFJJT1JJVFlfSElHSCk7Ci0gICAgICAgICAgICAgICAgICAgIF9l d2tfdGlsZWRfYmFja2luZ19zdG9yZV9pdGVtX3Byb2Nlc3NfaWRsZXJfc3RhcnQocHJpdik7Ci0K LSAgICAgICAgICAgICAgICAgICAgZ290byBlbmQ7Ci0gICAgICAgICAgICAgICAgfQotCiAgICAg ICAgICAgICAgICAgdCA9IF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV90aWxlX25ldyhwcml2LCBt X2NvbCwgbV9yb3csIHpvb20pOwogICAgICAgICAgICAgICAgIGlmICghdCkKICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CkBAIC02OTIsNyArNjMzLDYgQEAgc3RhdGljIEV3 a19UaWxlZF9CYWNraW5nX1N0b3JlX0l0ZW0gKl9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV9pdGVt X2FkZChFd2tfVGlsZWQKICAgICBpdC0+dGlsZSA9IE5VTEw7CiAgICAgaXQtPnVwZGF0ZS5wcm9j ZXNzID0gTlVMTDsKICAgICBpdC0+c21vb3RoX3NjYWxlID0gcHJpdi0+dmlldy50aWxlLnpvb21f d2Vha19zbW9vdGhfc2NhbGU7Ci0gICAgaXQtPnByZV9yZW5kZXIgPSBOVUxMOwogICAgIF9ld2tf dGlsZWRfYmFja2luZ19zdG9yZV9pdGVtX21vdmUoaXQsIHgsIHkpOwogICAgIF9ld2tfdGlsZWRf YmFja2luZ19zdG9yZV9pdGVtX3Jlc2l6ZShpdCwgdHcsIHRoKTsKICAgICBpZiAoIV9ld2tfdGls ZWRfYmFja2luZ19zdG9yZV9pdGVtX2ZpbGwocHJpdiwgaXQsIGNvbCwgcm93KSkgewpAQCAtNzEx LDExICs2NTEsNiBAQCBzdGF0aWMgdm9pZCBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfaXRlbV9k ZWwoRXdrX1RpbGVkX0JhY2tpbmdfU3RvcmVfRGF0YSAqcHJpdgogICAgIH0KICAgICBpZiAoaXQt PnVwZGF0ZS5wcm9jZXNzKQogICAgICAgICBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfaXRlbV9y ZXF1ZXN0X2RlbChwcml2LCBpdCk7Ci0gICAgaWYgKGl0LT5wcmVfcmVuZGVyKSB7Ci0gICAgICAg IF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV9wcmVfcmVuZGVyX3JlcXVlc3RfZGVsKAotICAgICAg ICAgICAgcHJpdiwgaXQtPnByZV9yZW5kZXIpOwotICAgICAgICBpdC0+cHJlX3JlbmRlciA9IE5V TEw7Ci0gICAgfQogICAgIGZyZWUoaXQpOwogfQogCkBAIC0xMDMxLDggKzk2Niw2IEBAIHN0YXRp YyB2b2lkIF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV9yZWNhbGNfcmVuZGVyZXJzKEV3a19UaWxl ZF9CYWNraW5nX1N0b3JlX0RhCiAgICAgaWYgKHByaXYtPnZpZXcuY29scyA9PSBjb2xzICYmIHBy aXYtPnZpZXcucm93cyA9PSByb3dzKQogICAgICAgICByZXR1cm47CiAKLSAgICBfZXdrX3RpbGVk X2JhY2tpbmdfc3RvcmVfcHJlX3JlbmRlcl9yZXF1ZXN0X3JlbW92ZV9hc3NvY2lhdGVkKHByaXYp OwotCiAgICAgb2xkX2NvbHMgPSBwcml2LT52aWV3LmNvbHM7CiAgICAgb2xkX3Jvd3MgPSBwcml2 LT52aWV3LnJvd3M7CiAKQEAgLTIwNTEsNyArMTk4NCw3IEBAIEVpbmFfQm9vbCBld2tfdGlsZWRf YmFja2luZ19zdG9yZV9wcmVfcmVuZGVyX3JlZ2lvbihFdmFzX09iamVjdCAqbywgRXZhc19Db29y ZCB4CiAgICAgd2hpbGUgKGVpbmFfdGlsZV9ncmlkX3NsaWNlcl9uZXh0KCZzbGljZXIsICZpbmZv KSkgewogICAgICAgICBjb25zdCB1bnNpZ25lZCBsb25nIGMgPSBpbmZvLT5jb2w7CiAgICAgICAg IGNvbnN0IHVuc2lnbmVkIGxvbmcgciA9IGluZm8tPnJvdzsKLSAgICAgICAgaWYgKCFfZXdrX3Rp bGVkX2JhY2tpbmdfc3RvcmVfcHJlX3JlbmRlcl9yZXF1ZXN0X2FkZChwcml2LCBjLCByLCB6b29t LCBOVUxMLCBQUkVfUkVOREVSX1BSSU9SSVRZX0xPVykpCisgICAgICAgIGlmICghX2V3a190aWxl ZF9iYWNraW5nX3N0b3JlX3ByZV9yZW5kZXJfcmVxdWVzdF9hZGQocHJpdiwgYywgciwgem9vbSwg UFJFX1JFTkRFUl9QUklPUklUWV9MT1cpKQogICAgICAgICAgICAgYnJlYWs7CiAgICAgfQogCkBA IC0yMDgyLDcgKzIwMTUsNyBAQCBFaW5hX0Jvb2wgZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfcHJl X3JlbmRlcl9yZWxhdGl2ZV9yYWRpdXMoRXZhc19PYmplY3QgKm8sIHVucwogCiAgICAgZm9yIChp ID0gc3RhcnRfcm93OyBpIDw9IGVuZF9yb3c7IGkrKykKICAgICAgICAgZm9yIChqID0gc3RhcnRf Y29sOyBqIDw9IGVuZF9jb2w7IGorKykKLSAgICAgICAgICAgIGlmICghX2V3a190aWxlZF9iYWNr aW5nX3N0b3JlX3ByZV9yZW5kZXJfcmVxdWVzdF9hZGQocHJpdiwgaiwgaSwgem9vbSwgTlVMTCwg UFJFX1JFTkRFUl9QUklPUklUWV9MT1cpKQorICAgICAgICAgICAgaWYgKCFfZXdrX3RpbGVkX2Jh Y2tpbmdfc3RvcmVfcHJlX3JlbmRlcl9yZXF1ZXN0X2FkZChwcml2LCBqLCBpLCB6b29tLCBQUkVf UkVOREVSX1BSSU9SSVRZX0xPVykpCiAgICAgICAgICAgICAgICAgZ290byBzdGFydF9wcm9jZXNz aW5nOwogCiBzdGFydF9wcm9jZXNzaW5nOgpAQCAtMjEwMyw3ICsyMDM2LDcgQEAgdm9pZCBld2tf dGlsZWRfYmFja2luZ19zdG9yZV9wcmVfcmVuZGVyX2NhbmNlbChFdmFzX09iamVjdCAqbykKICAg ICBQUklWX0RBVEFfR0VUX09SX1JFVFVSTihvLCBwcml2KTsKICAgICBFd2tfVGlsZV9VbnVzZWRf Q2FjaGUgKnR1YzsKIAotICAgIF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV9wcmVfcmVuZGVyX3Jl cXVlc3RfcmVtb3ZlX3VuYXNzb2NpYXRlZChwcml2KTsKKyAgICBfZXdrX3RpbGVkX2JhY2tpbmdf c3RvcmVfcHJlX3JlbmRlcl9yZXF1ZXN0X2NsZWFyKHByaXYpOwogCiAgICAgdHVjID0gZXdrX3Rp bGVfbWF0cml4X3VudXNlZF9jYWNoZV9nZXQocHJpdi0+bW9kZWwubWF0cml4KTsKICAgICBld2tf dGlsZV91bnVzZWRfY2FjaGVfdW5sb2NrX2FyZWEodHVjKTsK 76187 2010-12-10 05:46:51 -0800 2010-12-13 17:28:30 -0800 Patch bug-50023-20101210114649.patch text/plain 10358 abgrilo ZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK aW5kZXggODI3Y2ZiY2ZiNWYzMTRhN2EzMGNhNzdmMjc1YmI5ZjBhNmZmNzMzNC4uNTFkZmI4ODg2 NDUwMDBkNmM1MTIyMjVjOWQzMjdjYjM2OTg2MjM4NSAxMDA2NDQKLS0tIGEvV2ViS2l0L2VmbC9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAx MC0xMS0yNCAgQWxleCBCcmVkYXJpb2wgR3JpbG8gIDxhYmdyaWxvQHByb2Z1c2lvbi5tb2JpPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBh ZGphY2VudCB0aWxlcyByZW5kZXJpbmcgcXVldWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDAyMworCisgICAgICAgIEluIHRoZSBjdXJyZW50IGlt cGxlbWVudGF0aW9uIG9mIHRoZSB0aWxlZCBiYWNraW5nIHN0b3JlLCBvbmUgZXh0cmEgcm93Cisg ICAgICAgIGFuZCBjb2x1bW4gb2YgdGlsZXMgYXJlIG5lZWRlZCB0byByZW5kZXIgdGhlIGVudGly ZSB2aWV3cG9ydC4gVGhlc2UKKyAgICAgICAgZXh0cmEgcm93L2NvbCBwcm92ZWQgdG8gYmUgZXhw ZW5zaXZlIHdoZW4gYmVpbmcgcmVuZGVyZWQsIGFuZCB3ZXJlCisgICAgICAgIHBvc3Rwb25lZCB0 byBhIHF1ZXVlIHRoYXQgd291bGQgcmVuZGVyIHRoZW0gYWZ0ZXIgcmVuZGVyaW5nIHRoZSBvdGhl cgorICAgICAgICB0aWxlcyBvZiB0aGUgdmlld3BvcnQgZmlyc3QuIFRoaXMgYXBwcm9hY2ggY29t cGxpY2F0ZWQgdW5uZWNlc3NhcmlseQorICAgICAgICB0aGUgbG9naWNzIHdpdGggbm8gZ2FpbiBm b3Iga2VlcGluZyB0aGUgZXh0cmEgcm93IGFuZCBjb2x1bW4uIFRoaXMKKyAgICAgICAgY2hhbmdl IHJlbW92ZXMgdGhpcyByZW5kZXJpbmcgcXVldWUsIGZvciBsYXRlciByZW1vdmluZyB0aGUgZXh0 cmEgcm93CisgICAgICAgIGFuZCBjb2x1bW4gb2YgdGlsZXMuCisKKyAgICAgICAgKiBld2svZXdr X3RpbGVkX2JhY2tpbmdfc3RvcmUuYzoKKyAgICAgICAgKF9ld2tfdGlsZWRfYmFja2luZ19zdG9y ZV9wcmVfcmVuZGVyX3JlcXVlc3RfYWRkKToKKyAgICAgICAgKF9ld2tfdGlsZWRfYmFja2luZ19z dG9yZV9wcmVfcmVuZGVyX3JlcXVlc3RfZmx1c2gpOgorICAgICAgICAoX2V3a190aWxlZF9iYWNr aW5nX3N0b3JlX3ByZV9yZW5kZXJfcmVxdWVzdF9jbGVhcik6CisgICAgICAgIChfZXdrX3RpbGVk X2JhY2tpbmdfc3RvcmVfcHJlX3JlbmRlcl9yZXF1ZXN0X3Byb2Nlc3Nfc2luZ2xlKToKKyAgICAg ICAgKF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV9pdGVtX2ZpbGwpOgorICAgICAgICAoX2V3a190 aWxlZF9iYWNraW5nX3N0b3JlX2l0ZW1fYWRkKToKKyAgICAgICAgKF9ld2tfdGlsZWRfYmFja2lu Z19zdG9yZV9pdGVtX2RlbCk6CisgICAgICAgIChfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfcmVj YWxjX3JlbmRlcmVycyk6CisgICAgICAgIChld2tfdGlsZWRfYmFja2luZ19zdG9yZV9wcmVfcmVu ZGVyX3JlZ2lvbik6CisgICAgICAgIChld2tfdGlsZWRfYmFja2luZ19zdG9yZV9wcmVfcmVuZGVy X3JlbGF0aXZlX3JhZGl1cyk6CisgICAgICAgIChld2tfdGlsZWRfYmFja2luZ19zdG9yZV9wcmVf cmVuZGVyX2NhbmNlbCk6CisKIDIwMTAtMTItMDkgIEFsZXggQnJlZGFyaW9sIEdyaWxvICA8YWJn cmlsb0Bwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbnRvbmlvIEdvbWVz LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2VmbC9ld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuYyBi L1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmMKaW5kZXggMGU4ODk4YmMw NDk5NjU1OGZhY2NlYmU1ZmY5ZDQwODI1Y2YzNzcxNC4uMDU5MmM1MjlmZjBlNGQ4MzFkMjNlODZi ZTNjZjE5OTVkODhkNjdhMiAxMDA2NDQKLS0tIGEvV2ViS2l0L2VmbC9ld2svZXdrX3RpbGVkX2Jh Y2tpbmdfc3RvcmUuYworKysgYi9XZWJLaXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFja2luZ19zdG9y ZS5jCkBAIC02Miw3ICs2Miw2IEBAIHN0cnVjdCBfRXdrX1RpbGVkX0JhY2tpbmdfU3RvcmVfSXRl bSB7CiAgICAgICAgIHVuc2lnbmVkIGxvbmcgcm93LCBjb2w7CiAgICAgICAgIGZsb2F0IHpvb207 CiAgICAgfSB1cGRhdGU7Ci0gICAgRXdrX1RpbGVkX0JhY2tpbmdfU3RvcmVfUHJlX1JlbmRlcl9S ZXF1ZXN0ICpwcmVfcmVuZGVyOwogICAgIEVpbmFfQm9vbCBzbW9vdGhfc2NhbGU7CiB9OwogCkBA IC03MCw3ICs2OSw2IEBAIHN0cnVjdCBfRXdrX1RpbGVkX0JhY2tpbmdfU3RvcmVfUHJlX1JlbmRl cl9SZXF1ZXN0IHsKICAgICBFSU5BX0lOTElTVDsKICAgICB1bnNpZ25lZCBsb25nIGNvbCwgcm93 OwogICAgIGZsb2F0IHpvb207Ci0gICAgc3RydWN0IF9Fd2tfVGlsZWRfQmFja2luZ19TdG9yZV9J dGVtICppdDsKIH07CiAKIHN0cnVjdCBfRXdrX1RpbGVkX0JhY2tpbmdfU3RvcmVfRGF0YSB7CkBA IC0yNjYsNyArMjY0LDcgQEAgc3RhdGljIHZvaWQgX2V3a190aWxlZF9iYWNraW5nX3N0b3JlX3Rp bGVfZGlzc29jaWF0ZV9hbGwoRXdrX1RpbGVkX0JhY2tpbmdfU3RvcmUKICAgICB9CiB9CiAKLXN0 YXRpYyBpbmxpbmUgRWluYV9Cb29sIF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV9wcmVfcmVuZGVy X3JlcXVlc3RfYWRkKEV3a19UaWxlZF9CYWNraW5nX1N0b3JlX0RhdGEgKnByaXYsIHVuc2lnbmVk IGxvbmcgY29sLCB1bnNpZ25lZCBsb25nIHJvdywgZmxvYXQgem9vbSwgRXdrX1RpbGVkX0JhY2tp bmdfU3RvcmVfSXRlbSAqaXQsIEV3a19UaWxlZF9CYWNraW5nX1N0b3JlX1ByZV9SZW5kZXJfUHJp b3JpdHkgcHJpb3JpdHkpCitzdGF0aWMgaW5saW5lIEVpbmFfQm9vbCBfZXdrX3RpbGVkX2JhY2tp bmdfc3RvcmVfcHJlX3JlbmRlcl9yZXF1ZXN0X2FkZChFd2tfVGlsZWRfQmFja2luZ19TdG9yZV9E YXRhICpwcml2LCB1bnNpZ25lZCBsb25nIGNvbCwgdW5zaWduZWQgbG9uZyByb3csIGZsb2F0IHpv b20sIEV3a19UaWxlZF9CYWNraW5nX1N0b3JlX1ByZV9SZW5kZXJfUHJpb3JpdHkgcHJpb3JpdHkp CiB7CiAgICAgRXdrX1RpbGVkX0JhY2tpbmdfU3RvcmVfUHJlX1JlbmRlcl9SZXF1ZXN0ICpyOwog CkBAIC0yODIsMTAgKzI4MCw3IEBAIHN0YXRpYyBpbmxpbmUgRWluYV9Cb29sIF9ld2tfdGlsZWRf YmFja2luZ19zdG9yZV9wcmVfcmVuZGVyX3JlcXVlc3RfYWRkKEV3a19UaWxlCiAgICAgci0+Y29s ID0gY29sOwogICAgIHItPnJvdyA9IHJvdzsKICAgICByLT56b29tID0gem9vbTsKLSAgICByLT5p dCA9IGl0OwogCi0gICAgaWYgKGl0KQotICAgICAgICBpdC0+cHJlX3JlbmRlciA9IHI7CiAgICAg cmV0dXJuIEVJTkFfVFJVRTsKIH0KIApAQCAtMzA5LDE0ICszMDQsMTIgQEAgc3RhdGljIHZvaWQg X2V3a190aWxlZF9iYWNraW5nX3N0b3JlX3ByZV9yZW5kZXJfcmVxdWVzdF9mbHVzaChFd2tfVGls ZWRfQmFja2luZ18KICAgICB3aGlsZSAoKnBsKSB7CiAgICAgICAgIEV3a19UaWxlZF9CYWNraW5n X1N0b3JlX1ByZV9SZW5kZXJfUmVxdWVzdCAqcjsKICAgICAgICAgciA9IF9ld2tfdGlsZWRfYmFj a2luZ19zdG9yZV9wcmVfcmVuZGVyX3JlcXVlc3RfZmlyc3QocHJpdik7Ci0gICAgICAgIGlmIChy LT5pdCAmJiByLT5pdC0+cHJlX3JlbmRlcikKLSAgICAgICAgICAgIHItPml0LT5wcmVfcmVuZGVy ID0gTlVMTDsKICAgICAgICAgKnBsID0gZWluYV9pbmxpc3RfcmVtb3ZlKCpwbCwgKnBsKTsKICAg ICAgICAgZnJlZShyKTsKICAgICB9CiB9CiAKLXN0YXRpYyB2b2lkIF9ld2tfdGlsZWRfYmFja2lu Z19zdG9yZV9wcmVfcmVuZGVyX3JlcXVlc3RfcmVtb3ZlX3VuYXNzb2NpYXRlZChFd2tfVGlsZWRf QmFja2luZ19TdG9yZV9EYXRhICpwcml2KQorc3RhdGljIHZvaWQgX2V3a190aWxlZF9iYWNraW5n X3N0b3JlX3ByZV9yZW5kZXJfcmVxdWVzdF9jbGVhcihFd2tfVGlsZWRfQmFja2luZ19TdG9yZV9E YXRhICpwcml2KQogewogICAgIEVpbmFfSW5saXN0ICoqcGwgPSAmcHJpdi0+cmVuZGVyLnByZV9y ZW5kZXJfcmVxdWVzdHM7CiAgICAgRWluYV9Jbmxpc3QgKml0ZXIgPSAqcGwsICp0bXA7CkBAIC0z MjQsMzMgKzMxNywxMCBAQCBzdGF0aWMgdm9pZCBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfcHJl X3JlbmRlcl9yZXF1ZXN0X3JlbW92ZV91bmFzc29jaWF0ZWQoRXdrXwogICAgICAgICBFd2tfVGls ZWRfQmFja2luZ19TdG9yZV9QcmVfUmVuZGVyX1JlcXVlc3QgKnIgPQogICAgICAgICAgICAgRUlO QV9JTkxJU1RfQ09OVEFJTkVSX0dFVCgKICAgICAgICAgICAgICAgICBpdGVyLCBFd2tfVGlsZWRf QmFja2luZ19TdG9yZV9QcmVfUmVuZGVyX1JlcXVlc3QpOwotICAgICAgICBpZiAoIXItPml0KSB7 Ci0gICAgICAgICAgICB0bXAgPSBpdGVyLT5uZXh0OwotICAgICAgICAgICAgKnBsID0gZWluYV9p bmxpc3RfcmVtb3ZlKCpwbCwgaXRlcik7Ci0gICAgICAgICAgICBpdGVyID0gdG1wOwotICAgICAg ICAgICAgZnJlZShyKTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBpdGVyID0gaXRlci0+ bmV4dDsKLSAgICB9Ci19Ci0KLXN0YXRpYyB2b2lkIF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV9w cmVfcmVuZGVyX3JlcXVlc3RfcmVtb3ZlX2Fzc29jaWF0ZWQoRXdrX1RpbGVkX0JhY2tpbmdfU3Rv cmVfRGF0YSAqcHJpdikKLXsKLSAgICBFaW5hX0lubGlzdCAqKnBsID0gJnByaXYtPnJlbmRlci5w cmVfcmVuZGVyX3JlcXVlc3RzOwotICAgIEVpbmFfSW5saXN0ICppdGVyID0gKnBsLCAqdG1wOwot ICAgIHdoaWxlIChpdGVyKSB7Ci0gICAgICAgIEV3a19UaWxlZF9CYWNraW5nX1N0b3JlX1ByZV9S ZW5kZXJfUmVxdWVzdCAqciA9Ci0gICAgICAgICAgICBFSU5BX0lOTElTVF9DT05UQUlORVJfR0VU KAotICAgICAgICAgICAgICAgIGl0ZXIsIEV3a19UaWxlZF9CYWNraW5nX1N0b3JlX1ByZV9SZW5k ZXJfUmVxdWVzdCk7Ci0gICAgICAgIGlmIChyLT5pdCkgewotICAgICAgICAgICAgaWYgKHItPml0 LT5wcmVfcmVuZGVyKQotICAgICAgICAgICAgICAgIHItPml0LT5wcmVfcmVuZGVyID0gTlVMTDsK LSAgICAgICAgICAgIHRtcCA9IGl0ZXItPm5leHQ7Ci0gICAgICAgICAgICAqcGwgPSBlaW5hX2lu bGlzdF9yZW1vdmUoKnBsLCBpdGVyKTsKLSAgICAgICAgICAgIGl0ZXIgPSB0bXA7Ci0gICAgICAg ICAgICBmcmVlKHIpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIGl0ZXIgPSBpdGVyLT5u ZXh0OworICAgICAgICB0bXAgPSBpdGVyLT5uZXh0OworICAgICAgICAqcGwgPSBlaW5hX2lubGlz dF9yZW1vdmUoKnBsLCBpdGVyKTsKKyAgICAgICAgaXRlciA9IHRtcDsKKyAgICAgICAgZnJlZShy KTsKICAgICB9CiB9CiAKQEAgLTM3OSwxMSArMzQ5LDYgQEAgc3RhdGljIHZvaWQgX2V3a190aWxl ZF9iYWNraW5nX3N0b3JlX3ByZV9yZW5kZXJfcmVxdWVzdF9wcm9jZXNzX3NpbmdsZShFd2tfVGls ZWQKICAgICAgICAgZ290byBlbmQ7CiAgICAgfQogCi0gICAgaWYgKHJlcS0+aXQgJiYgcmVxLT5p dC0+dGlsZSkgewotICAgICAgICBDUklUSUNBTCgiaXQtPnRpbGUgPSAlcCAoJWx1LCAlbHUpLCBi dXQgc2hvdWxkIGJlIE5VTEwiLCByZXEtPml0LT50aWxlLCByZXEtPml0LT50aWxlLT5yb3csIHJl cS0+aXQtPnRpbGUtPmNvbCk7Ci0gICAgICAgIGdvdG8gZW5kOwotICAgIH0KLQogICAgIHQgPSBf ZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdGlsZV9uZXcocHJpdiwgY29sLCByb3csIHpvb20pOwog ICAgIGlmICghdCkKICAgICAgICAgZ290byBlbmQ7CkBAIC0zOTksMTIgKzM2NCw3IEBAIHN0YXRp YyB2b2lkIF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV9wcmVfcmVuZGVyX3JlcXVlc3RfcHJvY2Vz c19zaW5nbGUoRXdrX1RpbGVkCiAgICAgICAgIGFyZWEueCwgYXJlYS55LCBhcmVhLncsIGFyZWEu aCk7CiAgICAgZXdrX3RpbGVfbWF0cml4X3RpbGVfdXBkYXRlc19jbGVhcih0bSwgdCk7CiAKLSAg ICBpZiAocmVxLT5pdCkgewotICAgICAgICBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdGlsZV9h c3NvY2lhdGUocHJpdiwgdCwgcmVxLT5pdCk7Ci0gICAgICAgIGlmIChyZXEtPml0LT5wcmVfcmVu ZGVyKQotICAgICAgICAgICAgcmVxLT5pdC0+cHJlX3JlbmRlciA9IE5VTEw7Ci0gICAgfSBlbHNl Ci0gICAgICAgIGV3a190aWxlX21hdHJpeF90aWxlX3B1dCh0bSwgdCwgbGFzdF91c2VkKTsKKyAg ICBld2tfdGlsZV9tYXRyaXhfdGlsZV9wdXQodG0sIHQsIGxhc3RfdXNlZCk7CiAKIGVuZDoKICAg ICBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfcHJlX3JlbmRlcl9yZXF1ZXN0X2RlbChwcml2LCBy ZXEpOwpAQCAtNjEwLDEyICs1NzAsNiBAQCBzdGF0aWMgaW5saW5lIEVpbmFfQm9vbCBfZXdrX3Rp bGVkX2JhY2tpbmdfc3RvcmVfaXRlbV9maWxsKEV3a19UaWxlZF9CYWNraW5nX1N0bwogICAgICAg ICAgICAgX2V3a190aWxlZF9iYWNraW5nX3N0b3JlX2l0ZW1fcmVxdWVzdF9kZWwocHJpdiwgaXQp OwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKGl0LT5wcmVfcmVuZGVyKSB7Ci0gICAgICAgICAg ICBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfcHJlX3JlbmRlcl9yZXF1ZXN0X2RlbCgKLSAgICAg ICAgICAgICAgICBwcml2LCBpdC0+cHJlX3JlbmRlcik7Ci0gICAgICAgICAgICBpdC0+cHJlX3Jl bmRlciA9IE5VTEw7Ci0gICAgICAgIH0KLQogICAgICAgICBpZiAoaXQtPnRpbGUpIHsKICAgICAg ICAgICAgIEV3a19UaWxlICpvbGQgPSBpdC0+dGlsZTsKICAgICAgICAgICAgIGlmIChvbGQtPnJv dyAhPSBtX3JvdyB8fCBvbGQtPmNvbCAhPSBtX2NvbCB8fCBvbGQtPnpvb20gIT0gem9vbSkgewpA QCAtNjQwLDE5ICs1OTQsNiBAQCBzdGF0aWMgaW5saW5lIEVpbmFfQm9vbCBfZXdrX3RpbGVkX2Jh Y2tpbmdfc3RvcmVfaXRlbV9maWxsKEV3a19UaWxlZF9CYWNraW5nX1N0bwogCiAgICAgICAgICAg ICAvKiBEbyBub3QgYWRkIG5ldyByZXF1ZXN0cyB0byB0aGUgcmVuZGVyIHF1ZXVlICovCiAgICAg ICAgICAgICBpZiAoIXByaXYtPnJlbmRlci5zdXNwZW5kKSB7Ci0gICAgICAgICAgICAgICAgaWYg KCFfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdGlsZV9pc19pbnNpZGVfdmlld3BvcnQoCi0gICAg ICAgICAgICAgICAgICAgICAgICBwcml2LCBtX2NvbCwgbV9yb3cpKSB7Ci0gICAgICAgICAgICAg ICAgICAgIERCRygiJWQsJWQgaXMgbm90IGluc2lkZSB0aGUgdmlld3BvcnQiLCBtX2NvbCwgbV9y b3cpOwotICAgICAgICAgICAgICAgICAgICBpZiAoX2V3a190aWxlZF9iYWNraW5nX3N0b3JlX3Rp bGVfaXNfYWRqYWNlbnRfdG9fdmlld3BvcnQoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg cHJpdiwgbV9jb2wsIG1fcm93KSkKLSAgICAgICAgICAgICAgICAgICAgICAgIF9ld2tfdGlsZWRf YmFja2luZ19zdG9yZV9wcmVfcmVuZGVyX3JlcXVlc3RfYWRkKAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHByaXYsIG1fY29sLCBtX3Jvdywgem9vbSwgaXQsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgUFJFX1JFTkRFUl9QUklPUklUWV9ISUdIKTsKLSAgICAgICAgICAgICAgICAg ICAgX2V3a190aWxlZF9iYWNraW5nX3N0b3JlX2l0ZW1fcHJvY2Vzc19pZGxlcl9zdGFydChwcml2 KTsKLQotICAgICAgICAgICAgICAgICAgICBnb3RvIGVuZDsKLSAgICAgICAgICAgICAgICB9Ci0K ICAgICAgICAgICAgICAgICB0ID0gX2V3a190aWxlZF9iYWNraW5nX3N0b3JlX3RpbGVfbmV3KHBy aXYsIG1fY29sLCBtX3Jvdywgem9vbSk7CiAgICAgICAgICAgICAgICAgaWYgKCF0KQogICAgICAg ICAgICAgICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKQEAgLTY5Miw3ICs2MzMsNiBAQCBzdGF0 aWMgRXdrX1RpbGVkX0JhY2tpbmdfU3RvcmVfSXRlbSAqX2V3a190aWxlZF9iYWNraW5nX3N0b3Jl X2l0ZW1fYWRkKEV3a19UaWxlZAogICAgIGl0LT50aWxlID0gTlVMTDsKICAgICBpdC0+dXBkYXRl LnByb2Nlc3MgPSBOVUxMOwogICAgIGl0LT5zbW9vdGhfc2NhbGUgPSBwcml2LT52aWV3LnRpbGUu em9vbV93ZWFrX3Ntb290aF9zY2FsZTsKLSAgICBpdC0+cHJlX3JlbmRlciA9IE5VTEw7CiAgICAg X2V3a190aWxlZF9iYWNraW5nX3N0b3JlX2l0ZW1fbW92ZShpdCwgeCwgeSk7CiAgICAgX2V3a190 aWxlZF9iYWNraW5nX3N0b3JlX2l0ZW1fcmVzaXplKGl0LCB0dywgdGgpOwogICAgIGlmICghX2V3 a190aWxlZF9iYWNraW5nX3N0b3JlX2l0ZW1fZmlsbChwcml2LCBpdCwgY29sLCByb3cpKSB7CkBA IC03MTEsMTEgKzY1MSw2IEBAIHN0YXRpYyB2b2lkIF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV9p dGVtX2RlbChFd2tfVGlsZWRfQmFja2luZ19TdG9yZV9EYXRhICpwcml2CiAgICAgfQogICAgIGlm IChpdC0+dXBkYXRlLnByb2Nlc3MpCiAgICAgICAgIF9ld2tfdGlsZWRfYmFja2luZ19zdG9yZV9p dGVtX3JlcXVlc3RfZGVsKHByaXYsIGl0KTsKLSAgICBpZiAoaXQtPnByZV9yZW5kZXIpIHsKLSAg ICAgICAgX2V3a190aWxlZF9iYWNraW5nX3N0b3JlX3ByZV9yZW5kZXJfcmVxdWVzdF9kZWwoCi0g ICAgICAgICAgICBwcml2LCBpdC0+cHJlX3JlbmRlcik7Ci0gICAgICAgIGl0LT5wcmVfcmVuZGVy ID0gTlVMTDsKLSAgICB9CiAgICAgZnJlZShpdCk7CiB9CiAKQEAgLTEwMzEsOCArOTY2LDYgQEAg c3RhdGljIHZvaWQgX2V3a190aWxlZF9iYWNraW5nX3N0b3JlX3JlY2FsY19yZW5kZXJlcnMoRXdr X1RpbGVkX0JhY2tpbmdfU3RvcmVfRGEKICAgICBpZiAocHJpdi0+dmlldy5jb2xzID09IGNvbHMg JiYgcHJpdi0+dmlldy5yb3dzID09IHJvd3MpCiAgICAgICAgIHJldHVybjsKIAotICAgIF9ld2tf dGlsZWRfYmFja2luZ19zdG9yZV9wcmVfcmVuZGVyX3JlcXVlc3RfcmVtb3ZlX2Fzc29jaWF0ZWQo cHJpdik7Ci0KICAgICBvbGRfY29scyA9IHByaXYtPnZpZXcuY29sczsKICAgICBvbGRfcm93cyA9 IHByaXYtPnZpZXcucm93czsKIApAQCAtMjA1MSw3ICsxOTg0LDcgQEAgRWluYV9Cb29sIGV3a190 aWxlZF9iYWNraW5nX3N0b3JlX3ByZV9yZW5kZXJfcmVnaW9uKEV2YXNfT2JqZWN0ICpvLCBFdmFz X0Nvb3JkIHgKICAgICB3aGlsZSAoZWluYV90aWxlX2dyaWRfc2xpY2VyX25leHQoJnNsaWNlciwg JmluZm8pKSB7CiAgICAgICAgIGNvbnN0IHVuc2lnbmVkIGxvbmcgYyA9IGluZm8tPmNvbDsKICAg ICAgICAgY29uc3QgdW5zaWduZWQgbG9uZyByID0gaW5mby0+cm93OwotICAgICAgICBpZiAoIV9l d2tfdGlsZWRfYmFja2luZ19zdG9yZV9wcmVfcmVuZGVyX3JlcXVlc3RfYWRkKHByaXYsIGMsIHIs IHpvb20sIE5VTEwsIFBSRV9SRU5ERVJfUFJJT1JJVFlfTE9XKSkKKyAgICAgICAgaWYgKCFfZXdr X3RpbGVkX2JhY2tpbmdfc3RvcmVfcHJlX3JlbmRlcl9yZXF1ZXN0X2FkZChwcml2LCBjLCByLCB6 b29tLCBQUkVfUkVOREVSX1BSSU9SSVRZX0xPVykpCiAgICAgICAgICAgICBicmVhazsKICAgICB9 CiAKQEAgLTIwODIsNyArMjAxNSw3IEBAIEVpbmFfQm9vbCBld2tfdGlsZWRfYmFja2luZ19zdG9y ZV9wcmVfcmVuZGVyX3JlbGF0aXZlX3JhZGl1cyhFdmFzX09iamVjdCAqbywgdW5zCiAKICAgICBm b3IgKGkgPSBzdGFydF9yb3c7IGkgPD0gZW5kX3JvdzsgaSsrKQogICAgICAgICBmb3IgKGogPSBz dGFydF9jb2w7IGogPD0gZW5kX2NvbDsgaisrKQotICAgICAgICAgICAgaWYgKCFfZXdrX3RpbGVk X2JhY2tpbmdfc3RvcmVfcHJlX3JlbmRlcl9yZXF1ZXN0X2FkZChwcml2LCBqLCBpLCB6b29tLCBO VUxMLCBQUkVfUkVOREVSX1BSSU9SSVRZX0xPVykpCisgICAgICAgICAgICBpZiAoIV9ld2tfdGls ZWRfYmFja2luZ19zdG9yZV9wcmVfcmVuZGVyX3JlcXVlc3RfYWRkKHByaXYsIGosIGksIHpvb20s IFBSRV9SRU5ERVJfUFJJT1JJVFlfTE9XKSkKICAgICAgICAgICAgICAgICBnb3RvIHN0YXJ0X3By b2Nlc3Npbmc7CiAKIHN0YXJ0X3Byb2Nlc3Npbmc6CkBAIC0yMTAzLDcgKzIwMzYsNyBAQCB2b2lk IGV3a190aWxlZF9iYWNraW5nX3N0b3JlX3ByZV9yZW5kZXJfY2FuY2VsKEV2YXNfT2JqZWN0ICpv KQogICAgIFBSSVZfREFUQV9HRVRfT1JfUkVUVVJOKG8sIHByaXYpOwogICAgIEV3a19UaWxlX1Vu dXNlZF9DYWNoZSAqdHVjOwogCi0gICAgX2V3a190aWxlZF9iYWNraW5nX3N0b3JlX3ByZV9yZW5k ZXJfcmVxdWVzdF9yZW1vdmVfdW5hc3NvY2lhdGVkKHByaXYpOworICAgIF9ld2tfdGlsZWRfYmFj a2luZ19zdG9yZV9wcmVfcmVuZGVyX3JlcXVlc3RfY2xlYXIocHJpdik7CiAKICAgICB0dWMgPSBl d2tfdGlsZV9tYXRyaXhfdW51c2VkX2NhY2hlX2dldChwcml2LT5tb2RlbC5tYXRyaXgpOwogICAg IGV3a190aWxlX3VudXNlZF9jYWNoZV91bmxvY2tfYXJlYSh0dWMpOwo=