112419 2013-03-15 02:03:01 -0700 [GTK][WK2] MiniBrowser custom URI scheme support 2013-04-04 06:24:52 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 rego webkit-unassigned buildbot cgarcia mrobinson rniwa webkit.review.bot xan.lopez oldest_to_newest 855812 0 rego 2013-03-15 02:03:01 -0700 Add support for "about:foo" URIs in MiniBrowser. 855820 1 193260 rego 2013-03-15 02:21:50 -0700 Created attachment 193260 Patch 855822 2 rego 2013-03-15 02:23:26 -0700 The patch works properly in the stable branch. However in trunk when you try to go to "about:minibrowser" (or any other "about:" URI) you get the following message : URL cannot be shown I still need to figure out what happens there, but I'd like to gather your feedback about the patch anyway. 855829 3 rego 2013-03-15 02:38:30 -0700 (In reply to comment #2) > However in trunk when you try to go to "about:minibrowser" (or any other "about:" URI) you get the following message : > URL cannot be shown > > I still need to figure out what happens there, but I'd like to gather your feedback about the patch anyway. Maybe the problem in trunk is related with bug #112421 (not sure yet). 855928 4 193260 buildbot 2013-03-15 06:04:33 -0700 Comment on attachment 193260 Patch Attachment 193260 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-commit-queue.appspot.com/results/17179178 New failing tests: fast/css/sticky/inline-sticky.html 866768 5 193260 cgarcia 2013-03-31 03:46:18 -0700 Comment on attachment 193260 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193260&action=review Looks good in general, but there are a few minor issues. > Tools/MiniBrowser/gtk/BrowserWindow.c:74 > +static const char* getInternalURI(const char* uri) This is a C file, so the * are placed correctly: static const char *getInternalURI(const char *uri) > Tools/MiniBrowser/gtk/BrowserWindow.c:76 > + // Internally we use minibrowser-about: as about: prefix is ignored by WebKit Comments should finish with a period. > Tools/MiniBrowser/gtk/BrowserWindow.c:78 > + return g_strconcat(miniBrowserAboutScheme, uri + strlen ("about"), NULL); The function returns a const char *, but this is retuning a new allocated string. The function should return char * and duplicated the uri whe it's not an about one. If you want to avoid the unnecessary string duplication when it's not an about URI, you can move the check out of the function and only call it when you know it's an about URI or you can cache the current uri in the browser window struct. > Tools/MiniBrowser/gtk/BrowserWindow.c:89 > +static const char* getExternalURI(const char* uri) > +{ > + // From the user point of view we support about: prefix > + if (g_str_has_prefix(uri, miniBrowserAboutScheme)) > + return g_strconcat("about", uri + strlen(miniBrowserAboutScheme), NULL); > + > + return uri; Ditto everything. > Tools/MiniBrowser/gtk/BrowserWindow.c:102 > + contents = g_strdup_printf("<html><body><p>WebKitGTK+ MiniBrowser about page</p></body></html>"); Maybe we can make this a bit more useful and include more information like the webkitgtk version number, for example. > Tools/MiniBrowser/gtk/BrowserWindow.c:617 > + webkit_web_context_register_uri_scheme(webkit_web_view_get_context(window->webView), miniBrowserAboutScheme, aboutURISchemeRequestCallback, 0, 0); You don't want do this for every browser window, but only once for the default web context. You can use NULL instead of 0 here. 867024 6 195949 rego 2013-04-01 03:54:03 -0700 Created attachment 195949 Patch 867025 7 webkit.review.bot 2013-04-01 03:55:41 -0700 Attachment 195949 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/MiniBrowser/gtk/BrowserWindow.c', u'Tools/MiniBrowser/gtk/main.c']" exit_code: 1 Tools/MiniBrowser/gtk/main.c:213: Extra space before ( in function call [whitespace/parens] [4] Tools/MiniBrowser/gtk/main.c:213: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Tools/MiniBrowser/gtk/main.c:214: Extra space before ( in function call [whitespace/parens] [4] Tools/MiniBrowser/gtk/main.c:214: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Tools/MiniBrowser/gtk/main.c:215: Extra space before ( in function call [whitespace/parens] [4] Tools/MiniBrowser/gtk/main.c:215: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 6 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 867030 8 195949 cgarcia 2013-04-01 04:04:18 -0700 Comment on attachment 195949 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195949&action=review Looks better, setting r- because of the leaks and style issues. > Tools/MiniBrowser/gtk/BrowserWindow.c:140 > + gtk_entry_set_text(GTK_ENTRY(window->uriEntry), getExternalURI(webkit_web_view_get_uri(webView))); This is leaking the uri, you should either use a variable to free the uri after set_text, or cache the uri in the window structure and make getExternalURI return a const char * > Tools/MiniBrowser/gtk/BrowserWindow.c:301 > + titleOrURI = getExternalURI(webkit_web_view_get_uri(window->webView)); titleOrURI is const char, getExternalURI returns a new allocated string that you are leaking here. > Tools/MiniBrowser/gtk/BrowserWindow.c:665 > + webkit_web_view_load_uri(window->webView, getInternalURI(uri)); Same leak here. > Tools/MiniBrowser/gtk/main.c:212 > + contents = g_strdup_printf("<html><body><h1>WebKitGTK+ MiniBrowser</h1><p>About page example.</p><p>Version: %d.%d.%d</p></body></html>", We don't need to say this is an about page example, just a use a sentence like any other about app. WebKitGTK+ MiniBrowser 2.0.0 The WebKit2 test browser of the GTK+ port. Or something similar. >>> Tools/MiniBrowser/gtk/main.c:215 >>> + webkit_get_micro_version ()); >> >> Extra space before ( in function call [whitespace/parens] [4] > > Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Fix all the style issue please. 867051 9 195959 rego 2013-04-01 05:04:57 -0700 Created attachment 195959 Patch 867052 10 webkit.review.bot 2013-04-01 05:07:17 -0700 Attachment 195959 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/MiniBrowser/gtk/BrowserWindow.c', u'Tools/MiniBrowser/gtk/main.c']" exit_code: 1 Tools/MiniBrowser/gtk/main.c:213: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Tools/MiniBrowser/gtk/main.c:214: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Tools/MiniBrowser/gtk/main.c:215: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 3 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 869121 11 196467 rego 2013-04-04 05:04:22 -0700 Created attachment 196467 Patch Fix style issues. 869141 12 196467 webkit.review.bot 2013-04-04 06:24:48 -0700 Comment on attachment 196467 Patch Clearing flags on attachment: 196467 Committed r147624: <http://trac.webkit.org/changeset/147624> 869142 13 webkit.review.bot 2013-04-04 06:24:52 -0700 All reviewed patches have been landed. Closing bug. 193260 2013-03-15 02:21:50 -0700 2013-04-01 03:53:56 -0700 Patch bug-112419-20130315101745.patch text/plain 5656 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODU0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWMwMjBhYzg3ZDc5NGY5NmZkODZkYWRlYWQ3NDVjOWJh MjRkNzI4Yy4uNmEyMjcxMmUxY2QyMmU0MjkxNzZlZmJmYjBlNTc3MjIwYmIwMTU3YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDEzLTAzLTE1ICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdW1dLMl0gTWluaUJyb3dzZXIgY3VzdG9tIFVSSSBzY2hlbWUgc3Vw cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEy NDE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IHN1cHBvcnQgZm9yIGFib3V0IFVSSXMgaW4gTWluaUJyb3dzZXIuIEFuIGV4YW1wbGUgYWJvdXQg cGFnZSBpcyBzaG93CisgICAgICAgIHdpdGggVVJJICJhYm91dDptaW5pYnJvd3NlciIsIHRoZSBy ZXN0IG9mIHRoZSBjYXNlcyBpdCB3aWxsIHNob3cgYQorICAgICAgICBwcm9wZXIgbWVzc2FnZSBl eHBsYWluaW5nIHRoYXQgdGhlIGFib3V0IHBhZ2UgZGlkbid0IGV4aXN0LgorCisgICAgICAgIElu dGVybmFsbHkgaXQgdXNlcyAibWluaWJyb3dzZXItYWJvdXQiIHByZWZpeCBpbnN0ZWFkIG9mICJh Ym91dCIsIGJ1dAorICAgICAgICBmcm9tIHRoZSB1c2VyIHBvaW50IG9mIHZpZXcgaXQgd29ya3Mg d2l0aCAiYWJvdXQiIHByZWZpeC4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2Vy V2luZG93LmM6IEFkZCBtaW5pQnJvd3NlckFib3V0U2NoZW1lIGNvbnN0YW50LgorICAgICAgICAo Z2V0SW50ZXJuYWxVUkkpOiBNZXRob2QgdG8gY29udmVydCBVUklzIGZyb20gImFib3V0IiBwcmVm aXggdG8KKyAgICAgICAgIm1pbmlicm93c2VyLWFib3V0Ii4KKyAgICAgICAgKGdldEV4dGVybmFs VVJJKTogT3Bwb3NpdGUgbWV0aG9kLgorICAgICAgICAoYWJvdXRVUklTY2hlbWVSZXF1ZXN0Q2Fs bGJhY2spOiBDYWxsYmFjayB0byBtYW5hZ2UgYWJvdXQgY2FsbHMuCisgICAgICAgICh3ZWJWaWV3 VVJJQ2hhbmdlZCk6IFVzZSAiYWJvdXQiIHByZWZpeCB0byBzaG93IHRoZSBVUkkgdG8gdXNlcnMu CisgICAgICAgICh3ZWJWaWV3RW50ZXJGdWxsU2NyZWVuKTogRGl0dG8uCisgICAgICAgIChicm93 c2VyV2luZG93Q29uc3RydWN0ZWQpOiBSZWdpc3RlciB0aGUgVVJJIHNjaGVtZSB0byBtYW5hZ2Ug YWJvdXQgVVJJcy4KKyAgICAgICAgKGJyb3dzZXJfd2luZG93X2xvYWRfdXJpKTogVXNlICJtaW5p YnJvd3Nlci1hYm91dCIgcHJlZml4IGludGVybmFsbHkuCisKIDIwMTMtMDMtMTQgIE1hbnVlbCBS ZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAKICAgICAgICAgQWRkIHNlbGVjdFRy YWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQgc2V0dGluZyB0byBXZWJDb3JlOjpQYWdlCmRpZmYgLS1n aXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jIGIvVG9vbHMvTWluaUJy b3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwppbmRleCBhNWIwY2QzNWM0N2NhNzViODg1NzcxZDgw ZTlhZjNlMDY3MGZjNGE3Li43MzhkYjk2ZmNlMzI3MTE4MTdhODlkMGZlNDdkNTA0ZWNhOGNhZDIx IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCisrKyBi L1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKQEAgLTYzLDYgKzYzLDcgQEAg c3RydWN0IF9Ccm93c2VyV2luZG93Q2xhc3MgewogfTsKIAogc3RhdGljIGNvbnN0IGNoYXIgKmRl ZmF1bHRXaW5kb3dUaXRsZSA9ICJXZWJLaXRHVEsrIE1pbmlCcm93c2VyIjsKK3N0YXRpYyBjb25z dCBjaGFyICptaW5pQnJvd3NlckFib3V0U2NoZW1lID0gIm1pbmlicm93c2VyLWFib3V0IjsKIHN0 YXRpYyBjb25zdCBnZG91YmxlIG1pbmltdW1ab29tTGV2ZWwgPSAwLjU7CiBzdGF0aWMgY29uc3Qg Z2RvdWJsZSBtYXhpbXVtWm9vbUxldmVsID0gMzsKIHN0YXRpYyBjb25zdCBnZG91YmxlIHpvb21T dGVwID0gMS4yOwpAQCAtNzAsNiArNzEsNDUgQEAgc3RhdGljIGdpbnQgd2luZG93Q291bnQgPSAw OwogCiBHX0RFRklORV9UWVBFKEJyb3dzZXJXaW5kb3csIGJyb3dzZXJfd2luZG93LCBHVEtfVFlQ RV9XSU5ET1cpCiAKK3N0YXRpYyBjb25zdCBjaGFyKiBnZXRJbnRlcm5hbFVSSShjb25zdCBjaGFy KiB1cmkpCit7CisgICAgLy8gSW50ZXJuYWxseSB3ZSB1c2UgbWluaWJyb3dzZXItYWJvdXQ6IGFz IGFib3V0OiBwcmVmaXggaXMgaWdub3JlZCBieSBXZWJLaXQKKyAgICBpZiAoZ19zdHJfaGFzX3By ZWZpeCh1cmksICJhYm91dDoiKSAmJiAhZ19zdHJfZXF1YWwodXJpLCAiYWJvdXQ6YmxhbmsiKSkK KyAgICAgICAgcmV0dXJuIGdfc3RyY29uY2F0KG1pbmlCcm93c2VyQWJvdXRTY2hlbWUsIHVyaSAr IHN0cmxlbiAoImFib3V0IiksIE5VTEwpOworCisgICAgcmV0dXJuIHVyaTsKK30KKworc3RhdGlj IGNvbnN0IGNoYXIqIGdldEV4dGVybmFsVVJJKGNvbnN0IGNoYXIqIHVyaSkKK3sKKyAgICAvLyBG cm9tIHRoZSB1c2VyIHBvaW50IG9mIHZpZXcgd2Ugc3VwcG9ydCBhYm91dDogcHJlZml4CisgICAg aWYgKGdfc3RyX2hhc19wcmVmaXgodXJpLCBtaW5pQnJvd3NlckFib3V0U2NoZW1lKSkKKyAgICAg ICAgcmV0dXJuIGdfc3RyY29uY2F0KCJhYm91dCIsIHVyaSArIHN0cmxlbihtaW5pQnJvd3NlckFi b3V0U2NoZW1lKSwgTlVMTCk7CisKKyAgICByZXR1cm4gdXJpOworfQorCitzdGF0aWMgdm9pZAor YWJvdXRVUklTY2hlbWVSZXF1ZXN0Q2FsbGJhY2soV2ViS2l0VVJJU2NoZW1lUmVxdWVzdCAqcmVx dWVzdCwgZ3BvaW50ZXIgdXNlckRhdGEpCit7CisgICAgR0lucHV0U3RyZWFtICpzdHJlYW07Cisg ICAgZ3NpemUgc3RyZWFtTGVuZ3RoOworICAgIGNvbnN0IGdjaGFyICpwYXRoOworICAgIGdjaGFy ICpjb250ZW50czsKKworICAgIHBhdGggPSB3ZWJraXRfdXJpX3NjaGVtZV9yZXF1ZXN0X2dldF9w YXRoKHJlcXVlc3QpOworICAgIGlmICghZ19zdHJjbXAwKHBhdGgsICJtaW5pYnJvd3NlciIpKQor ICAgICAgICBjb250ZW50cyA9IGdfc3RyZHVwX3ByaW50ZigiPGh0bWw+PGJvZHk+PHA+V2ViS2l0 R1RLKyBNaW5pQnJvd3NlciBhYm91dCBwYWdlPC9wPjwvYm9keT48L2h0bWw+Iik7CisgICAgZWxz ZQorICAgICAgICBjb250ZW50cyA9IGdfc3RyZHVwX3ByaW50ZigiPGh0bWw+PGJvZHk+PHA+SW52 YWxpZCBhYm91dDolcyBwYWdlPC9wPjwvYm9keT48L2h0bWw+IiwgcGF0aCk7CisKKyAgICBzdHJl YW1MZW5ndGggPSBzdHJsZW4oY29udGVudHMpOworICAgIHN0cmVhbSA9IGdfbWVtb3J5X2lucHV0 X3N0cmVhbV9uZXdfZnJvbV9kYXRhKGNvbnRlbnRzLCBzdHJlYW1MZW5ndGgsIGdfZnJlZSk7CisK KyAgICB3ZWJraXRfdXJpX3NjaGVtZV9yZXF1ZXN0X2ZpbmlzaChyZXF1ZXN0LCBzdHJlYW0sIHN0 cmVhbUxlbmd0aCwgInRleHQvaHRtbCIpOworICAgIGdfb2JqZWN0X3VucmVmKHN0cmVhbSk7Cit9 CisKIHN0YXRpYyB2b2lkIGJyb3dzZXJXaW5kb3dTZXRTdGF0dXNUZXh0KEJyb3dzZXJXaW5kb3cg KndpbmRvdywgY29uc3QgY2hhciAqdGV4dCkKIHsKICNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAy LCAwKQpAQCAtMTE4LDcgKzE1OCw3IEBAIHN0YXRpYyB2b2lkIHNldHRpbmdzQ2FsbGJhY2soQnJv d3NlcldpbmRvdyAqd2luZG93KQogCiBzdGF0aWMgdm9pZCB3ZWJWaWV3VVJJQ2hhbmdlZChXZWJL aXRXZWJWaWV3ICp3ZWJWaWV3LCBHUGFyYW1TcGVjICpwc3BlYywgQnJvd3NlcldpbmRvdyAqd2lu ZG93KQogewotICAgIGd0a19lbnRyeV9zZXRfdGV4dChHVEtfRU5UUlkod2luZG93LT51cmlFbnRy eSksIHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKHdlYlZpZXcpKTsKKyAgICBndGtfZW50cnlfc2V0 X3RleHQoR1RLX0VOVFJZKHdpbmRvdy0+dXJpRW50cnkpLCBnZXRFeHRlcm5hbFVSSSh3ZWJraXRf d2ViX3ZpZXdfZ2V0X3VyaSh3ZWJWaWV3KSkpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJWaWV3VGl0 bGVDaGFuZ2VkKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEdQYXJhbVNwZWMgKnBzcGVjLCBCcm93 c2VyV2luZG93ICp3aW5kb3cpCkBAIC0yNzksNyArMzE5LDcgQEAgc3RhdGljIGdib29sZWFuIHdl YlZpZXdFbnRlckZ1bGxTY3JlZW4oV2ViS2l0V2ViVmlldyAqd2ViVmlldywgQnJvd3NlcldpbmRv dyAqd2kKICNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAyLCAwKQogICAgIGNvbnN0IGdjaGFyICp0 aXRsZU9yVVJJID0gd2Via2l0X3dlYl92aWV3X2dldF90aXRsZSh3aW5kb3ctPndlYlZpZXcpOwog ICAgIGlmICghdGl0bGVPclVSSSkKLSAgICAgICAgdGl0bGVPclVSSSA9IHdlYmtpdF93ZWJfdmll d19nZXRfdXJpKHdpbmRvdy0+d2ViVmlldyk7CisgICAgICAgIHRpdGxlT3JVUkkgPSBnZXRFeHRl cm5hbFVSSSh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaSh3aW5kb3ctPndlYlZpZXcpKTsKICAgICBn Y2hhciAqbWVzc2FnZSA9IGdfc3RyZHVwX3ByaW50ZigiJXMgaXMgbm93IGZ1bGwgc2NyZWVuLiBQ cmVzcyBFU0Mgb3IgZiB0byBleGl0LiIsIHRpdGxlT3JVUkkpOwogICAgIGd0a19sYWJlbF9zZXRf dGV4dChHVEtfTEFCRUwod2luZG93LT5mdWxsU2NyZWVuTWVzc2FnZUxhYmVsKSwgbWVzc2FnZSk7 CiAgICAgZ19mcmVlKG1lc3NhZ2UpOwpAQCAtNTc0LDYgKzYxNCw4IEBAIHN0YXRpYyB2b2lkIGJy b3dzZXJXaW5kb3dDb25zdHJ1Y3RlZChHT2JqZWN0ICpnT2JqZWN0KQogICAgIFdlYktpdEJhY2tG b3J3YXJkTGlzdCAqYmFja0ZvcndhZGxpc3QgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2JhY2tfZm9y d2FyZF9saXN0KHdpbmRvdy0+d2ViVmlldyk7CiAgICAgZ19zaWduYWxfY29ubmVjdChiYWNrRm9y d2FkbGlzdCwgImNoYW5nZWQiLCBHX0NBTExCQUNLKGJhY2tGb3J3YWRsaXN0Q2hhbmdlZCksIHdp bmRvdyk7CiAKKyAgICB3ZWJraXRfd2ViX2NvbnRleHRfcmVnaXN0ZXJfdXJpX3NjaGVtZSh3ZWJr aXRfd2ViX3ZpZXdfZ2V0X2NvbnRleHQod2luZG93LT53ZWJWaWV3KSwgbWluaUJyb3dzZXJBYm91 dFNjaGVtZSwgYWJvdXRVUklTY2hlbWVSZXF1ZXN0Q2FsbGJhY2ssIDAsIDApOworCiAjaWYgR1RL X0NIRUNLX1ZFUlNJT04oMywgMiwgMCkKICAgICBHdGtXaWRnZXQgKm92ZXJsYXkgPSBndGtfb3Zl cmxheV9uZXcoKTsKICAgICBndGtfYm94X3BhY2tfc3RhcnQoR1RLX0JPWCh3aW5kb3ctPm1haW5C b3gpLCBvdmVybGF5LCBUUlVFLCBUUlVFLCAwKTsKQEAgLTY0Myw3ICs2ODUsNyBAQCB2b2lkIGJy b3dzZXJfd2luZG93X2xvYWRfdXJpKEJyb3dzZXJXaW5kb3cgKndpbmRvdywgY29uc3QgY2hhciAq dXJpKQogICAgIGdfcmV0dXJuX2lmX2ZhaWwodXJpKTsKIAogICAgIGlmICghZ19zdHJfaGFzX3By ZWZpeCh1cmksICJqYXZhc2NyaXB0OiIpKSB7Ci0gICAgICAgIHdlYmtpdF93ZWJfdmlld19sb2Fk X3VyaSh3aW5kb3ctPndlYlZpZXcsIHVyaSk7CisgICAgICAgIHdlYmtpdF93ZWJfdmlld19sb2Fk X3VyaSh3aW5kb3ctPndlYlZpZXcsIGdldEludGVybmFsVVJJKHVyaSkpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCg== 195949 2013-04-01 03:54:03 -0700 2013-04-01 05:04:49 -0700 Patch bug-112419-20130401125356.patch text/plain 6412 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MzA2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTI2M2JjOGE0ZjY4YTAxZWE3MWI4YTgyZmNiYjA2YTZk MThkNjc1ZS4uMWQ3OTA5YzU1YzhhYWE5Nzg5ZWM2MGRkNmI1YzQxNWZmNDI4YTQxMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDEzLTA0LTAxICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdW1dLMl0gTWluaUJyb3dzZXIgY3VzdG9tIFVSSSBzY2hlbWUgc3Vw cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEy NDE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IHN1cHBvcnQgZm9yIGFib3V0IFVSSXMgaW4gTWluaUJyb3dzZXIuIEFuIGV4YW1wbGUgYWJvdXQg cGFnZSBpcyBzaG93CisgICAgICAgIHdpdGggVVJJICJhYm91dDptaW5pYnJvd3NlciIsIHRoZSBy ZXN0IG9mIHRoZSBjYXNlcyBpdCB3aWxsIHNob3cgYQorICAgICAgICBwcm9wZXIgbWVzc2FnZSBl eHBsYWluaW5nIHRoYXQgdGhlIGFib3V0IHBhZ2UgZGlkbid0IGV4aXN0LgorCisgICAgICAgIElu dGVybmFsbHkgaXQgdXNlcyAibWluaWJyb3dzZXItYWJvdXQiIHByZWZpeCBpbnN0ZWFkIG9mICJh Ym91dCIsIGJ1dAorICAgICAgICBmcm9tIHRoZSB1c2VyIHBvaW50IG9mIHZpZXcgaXQgd29ya3Mg d2l0aCAiYWJvdXQiIHByZWZpeC4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2Vy V2luZG93LmM6IEFkZCBtaW5pQnJvd3NlckFib3V0U2NoZW1lIGNvbnN0YW50LgorICAgICAgICAo Z2V0SW50ZXJuYWxVUkkpOiBNZXRob2QgdG8gY29udmVydCBVUklzIGZyb20gImFib3V0IiBwcmVm aXggdG8KKyAgICAgICAgIm1pbmlicm93c2VyLWFib3V0Ii4KKyAgICAgICAgKGdldEV4dGVybmFs VVJJKTogT3Bwb3NpdGUgbWV0aG9kLgorICAgICAgICAod2ViVmlld1VSSUNoYW5nZWQpOiBVc2Ug ImFib3V0IiBwcmVmaXggdG8gc2hvdyB0aGUgVVJJIHRvIHVzZXJzLgorICAgICAgICAod2ViVmll d0VudGVyRnVsbFNjcmVlbik6IERpdHRvLgorICAgICAgICAoYnJvd3Nlcl93aW5kb3dfbG9hZF91 cmkpOiBVc2UgIm1pbmlicm93c2VyLWFib3V0IiBwcmVmaXggaW50ZXJuYWxseS4KKyAgICAgICAg KiBNaW5pQnJvd3Nlci9ndGsvbWFpbi5jOiBBZGQgbWluaUJyb3dzZXJBYm91dFNjaGVtZSBjb25z dGFudC4KKyAgICAgICAgKGFib3V0VVJJU2NoZW1lUmVxdWVzdENhbGxiYWNrKTogQ2FsbGJhY2sg dG8gbWFuYWdlIGFib3V0IGNhbGxzLgorICAgICAgICAobWFpbik6IFJlZ2lzdGVyIHRoZSBVUkkg c2NoZW1lIHRvIG1hbmFnZSBhYm91dCBVUklzLgorCiAyMDEzLTAzLTMxICBTaGVyaWZmIEJvdCAg PHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByMTQ3Mjg5LgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dz ZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKaW5kZXgg YTViMGNkMzVjNDdjYTc1Yjg4NTc3MWQ4MGU5YWYzZTA2NzBmYzRhNy4uMzVkMzRkZDZmYThhZGJh MjNlOWU1OTc3MDAyNzg4ZjBkMjU1NmIxNCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIv Z3RrL0Jyb3dzZXJXaW5kb3cuYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3Nlcldp bmRvdy5jCkBAIC02Myw2ICs2Myw3IEBAIHN0cnVjdCBfQnJvd3NlcldpbmRvd0NsYXNzIHsKIH07 CiAKIHN0YXRpYyBjb25zdCBjaGFyICpkZWZhdWx0V2luZG93VGl0bGUgPSAiV2ViS2l0R1RLKyBN aW5pQnJvd3NlciI7CitzdGF0aWMgY29uc3QgY2hhciAqbWluaUJyb3dzZXJBYm91dFNjaGVtZSA9 ICJtaW5pYnJvd3Nlci1hYm91dCI7CiBzdGF0aWMgY29uc3QgZ2RvdWJsZSBtaW5pbXVtWm9vbUxl dmVsID0gMC41Owogc3RhdGljIGNvbnN0IGdkb3VibGUgbWF4aW11bVpvb21MZXZlbCA9IDM7CiBz dGF0aWMgY29uc3QgZ2RvdWJsZSB6b29tU3RlcCA9IDEuMjsKQEAgLTcwLDYgKzcxLDI0IEBAIHN0 YXRpYyBnaW50IHdpbmRvd0NvdW50ID0gMDsKIAogR19ERUZJTkVfVFlQRShCcm93c2VyV2luZG93 LCBicm93c2VyX3dpbmRvdywgR1RLX1RZUEVfV0lORE9XKQogCitzdGF0aWMgY2hhciAqZ2V0SW50 ZXJuYWxVUkkoY29uc3QgY2hhciAqdXJpKQoreworICAgIC8vIEludGVybmFsbHkgd2UgdXNlIG1p bmlicm93c2VyLWFib3V0OiBhcyBhYm91dDogcHJlZml4IGlzIGlnbm9yZWQgYnkgV2ViS2l0Lgor ICAgIGlmIChnX3N0cl9oYXNfcHJlZml4KHVyaSwgImFib3V0OiIpICYmICFnX3N0cl9lcXVhbCh1 cmksICJhYm91dDpibGFuayIpKQorICAgICAgICByZXR1cm4gZ19zdHJjb25jYXQobWluaUJyb3dz ZXJBYm91dFNjaGVtZSwgdXJpICsgc3RybGVuICgiYWJvdXQiKSwgTlVMTCk7CisKKyAgICByZXR1 cm4gZ19zdHJkdXAodXJpKTsKK30KKworc3RhdGljIGNoYXIgKmdldEV4dGVybmFsVVJJKGNvbnN0 IGNoYXIgKnVyaSkKK3sKKyAgICAvLyBGcm9tIHRoZSB1c2VyIHBvaW50IG9mIHZpZXcgd2Ugc3Vw cG9ydCBhYm91dDogcHJlZml4LgorICAgIGlmIChnX3N0cl9oYXNfcHJlZml4KHVyaSwgbWluaUJy b3dzZXJBYm91dFNjaGVtZSkpCisgICAgICAgIHJldHVybiBnX3N0cmNvbmNhdCgiYWJvdXQiLCB1 cmkgKyBzdHJsZW4obWluaUJyb3dzZXJBYm91dFNjaGVtZSksIE5VTEwpOworCisgICAgcmV0dXJu IGdfc3RyZHVwKHVyaSk7Cit9CisKIHN0YXRpYyB2b2lkIGJyb3dzZXJXaW5kb3dTZXRTdGF0dXNU ZXh0KEJyb3dzZXJXaW5kb3cgKndpbmRvdywgY29uc3QgY2hhciAqdGV4dCkKIHsKICNpZiBHVEtf Q0hFQ0tfVkVSU0lPTigzLCAyLCAwKQpAQCAtMTE4LDcgKzEzNyw3IEBAIHN0YXRpYyB2b2lkIHNl dHRpbmdzQ2FsbGJhY2soQnJvd3NlcldpbmRvdyAqd2luZG93KQogCiBzdGF0aWMgdm9pZCB3ZWJW aWV3VVJJQ2hhbmdlZChXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3LCBHUGFyYW1TcGVjICpwc3BlYywg QnJvd3NlcldpbmRvdyAqd2luZG93KQogewotICAgIGd0a19lbnRyeV9zZXRfdGV4dChHVEtfRU5U Ulkod2luZG93LT51cmlFbnRyeSksIHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKHdlYlZpZXcpKTsK KyAgICBndGtfZW50cnlfc2V0X3RleHQoR1RLX0VOVFJZKHdpbmRvdy0+dXJpRW50cnkpLCBnZXRF eHRlcm5hbFVSSSh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaSh3ZWJWaWV3KSkpOwogfQogCiBzdGF0 aWMgdm9pZCB3ZWJWaWV3VGl0bGVDaGFuZ2VkKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEdQYXJh bVNwZWMgKnBzcGVjLCBCcm93c2VyV2luZG93ICp3aW5kb3cpCkBAIC0yNzksNyArMjk4LDcgQEAg c3RhdGljIGdib29sZWFuIHdlYlZpZXdFbnRlckZ1bGxTY3JlZW4oV2ViS2l0V2ViVmlldyAqd2Vi VmlldywgQnJvd3NlcldpbmRvdyAqd2kKICNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAyLCAwKQog ICAgIGNvbnN0IGdjaGFyICp0aXRsZU9yVVJJID0gd2Via2l0X3dlYl92aWV3X2dldF90aXRsZSh3 aW5kb3ctPndlYlZpZXcpOwogICAgIGlmICghdGl0bGVPclVSSSkKLSAgICAgICAgdGl0bGVPclVS SSA9IHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKHdpbmRvdy0+d2ViVmlldyk7CisgICAgICAgIHRp dGxlT3JVUkkgPSBnZXRFeHRlcm5hbFVSSSh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaSh3aW5kb3ct PndlYlZpZXcpKTsKICAgICBnY2hhciAqbWVzc2FnZSA9IGdfc3RyZHVwX3ByaW50ZigiJXMgaXMg bm93IGZ1bGwgc2NyZWVuLiBQcmVzcyBFU0Mgb3IgZiB0byBleGl0LiIsIHRpdGxlT3JVUkkpOwog ICAgIGd0a19sYWJlbF9zZXRfdGV4dChHVEtfTEFCRUwod2luZG93LT5mdWxsU2NyZWVuTWVzc2Fn ZUxhYmVsKSwgbWVzc2FnZSk7CiAgICAgZ19mcmVlKG1lc3NhZ2UpOwpAQCAtNjQzLDcgKzY2Miw3 IEBAIHZvaWQgYnJvd3Nlcl93aW5kb3dfbG9hZF91cmkoQnJvd3NlcldpbmRvdyAqd2luZG93LCBj b25zdCBjaGFyICp1cmkpCiAgICAgZ19yZXR1cm5faWZfZmFpbCh1cmkpOwogCiAgICAgaWYgKCFn X3N0cl9oYXNfcHJlZml4KHVyaSwgImphdmFzY3JpcHQ6IikpIHsKLSAgICAgICAgd2Via2l0X3dl Yl92aWV3X2xvYWRfdXJpKHdpbmRvdy0+d2ViVmlldywgdXJpKTsKKyAgICAgICAgd2Via2l0X3dl Yl92aWV3X2xvYWRfdXJpKHdpbmRvdy0+d2ViVmlldywgZ2V0SW50ZXJuYWxVUkkodXJpKSk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2d0 ay9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jCmluZGV4IDE3ZTQ2ZjQ5YWI0 NGFjMDNhMTk3MGE2YjJkYjA0NTlmZTVkYzJjODUuLjM4YjRjNTZlNzFkOWJjOTAxMmRjOGU4MTkz NWQ4Y2ZjYmMxYjJlMzIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMK KysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL21haW4uYwpAQCAtMzIsNiArMzIsNyBAQAogI2lu Y2x1ZGUgPHdlYmtpdDIvd2Via2l0Mi5oPgogCiBzdGF0aWMgY29uc3QgZ2NoYXIgKip1cmlBcmd1 bWVudHMgPSBOVUxMOworc3RhdGljIGNvbnN0IGNoYXIgKm1pbmlCcm93c2VyQWJvdXRTY2hlbWUg PSAibWluaWJyb3dzZXItYWJvdXQiOwogCiBzdGF0aWMgZ2NoYXIgKmFyZ3VtZW50VG9VUkwoY29u c3QgY2hhciAqZmlsZW5hbWUpCiB7CkBAIC0xOTgsNiArMTk5LDMwIEBAIHN0YXRpYyBnYm9vbGVh biBhZGRTZXR0aW5nc0dyb3VwVG9Db250ZXh0KEdPcHRpb25Db250ZXh0ICpjb250ZXh0LCBXZWJL aXRTZXR0aW5nCiAgICAgcmV0dXJuIFRSVUU7CiB9CiAKK3N0YXRpYyB2b2lkCithYm91dFVSSVNj aGVtZVJlcXVlc3RDYWxsYmFjayhXZWJLaXRVUklTY2hlbWVSZXF1ZXN0ICpyZXF1ZXN0LCBncG9p bnRlciB1c2VyRGF0YSkKK3sKKyAgICBHSW5wdXRTdHJlYW0gKnN0cmVhbTsKKyAgICBnc2l6ZSBz dHJlYW1MZW5ndGg7CisgICAgY29uc3QgZ2NoYXIgKnBhdGg7CisgICAgZ2NoYXIgKmNvbnRlbnRz OworCisgICAgcGF0aCA9IHdlYmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZ2V0X3BhdGgocmVxdWVz dCk7CisgICAgaWYgKCFnX3N0cmNtcDAocGF0aCwgIm1pbmlicm93c2VyIikpCisgICAgICAgIGNv bnRlbnRzID0gZ19zdHJkdXBfcHJpbnRmKCI8aHRtbD48Ym9keT48aDE+V2ViS2l0R1RLKyBNaW5p QnJvd3NlcjwvaDE+PHA+QWJvdXQgcGFnZSBleGFtcGxlLjwvcD48cD5WZXJzaW9uOiAlZC4lZC4l ZDwvcD48L2JvZHk+PC9odG1sPiIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHdlYmtpdF9nZXRfbWFqb3JfdmVyc2lvbiAoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgd2Via2l0X2dldF9taW5vcl92ZXJzaW9uICgpLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB3ZWJraXRfZ2V0X21pY3JvX3ZlcnNpb24gKCkpOworICAgIGVsc2UK KyAgICAgICAgY29udGVudHMgPSBnX3N0cmR1cF9wcmludGYoIjxodG1sPjxib2R5PjxwPkludmFs aWQgYWJvdXQ6JXMgcGFnZS48L3A+PC9ib2R5PjwvaHRtbD4iLCBwYXRoKTsKKworICAgIHN0cmVh bUxlbmd0aCA9IHN0cmxlbihjb250ZW50cyk7CisgICAgc3RyZWFtID0gZ19tZW1vcnlfaW5wdXRf c3RyZWFtX25ld19mcm9tX2RhdGEoY29udGVudHMsIHN0cmVhbUxlbmd0aCwgZ19mcmVlKTsKKwor ICAgIHdlYmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZmluaXNoKHJlcXVlc3QsIHN0cmVhbSwgc3Ry ZWFtTGVuZ3RoLCAidGV4dC9odG1sIik7CisgICAgZ19vYmplY3RfdW5yZWYoc3RyZWFtKTsKK30K KwogaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIHsKICAgICBndGtfaW5pdCgmYXJn YywgJmFyZ3YpOwpAQCAtMjMxLDYgKzI1Niw4IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICph cmd2W10pCiAgICAgLy8gRW5hYmxlIHRoZSBmYXZpY29uIGRhdGFiYXNlLCBieSBzcGVjaWZ5aW5n IHRoZSBkZWZhdWx0IGRpcmVjdG9yeS4KICAgICB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X2Zhdmlj b25fZGF0YWJhc2VfZGlyZWN0b3J5KHdlYmtpdF93ZWJfY29udGV4dF9nZXRfZGVmYXVsdCgpLCBO VUxMKTsKIAorICAgIHdlYmtpdF93ZWJfY29udGV4dF9yZWdpc3Rlcl91cmlfc2NoZW1lKHdlYmtp dF93ZWJfY29udGV4dF9nZXRfZGVmYXVsdCgpLCBtaW5pQnJvd3NlckFib3V0U2NoZW1lLCBhYm91 dFVSSVNjaGVtZVJlcXVlc3RDYWxsYmFjaywgTlVMTCwgTlVMTCk7CisKICAgICBpZiAodXJpQXJn dW1lbnRzKSB7CiAgICAgICAgIGludCBpOwogCg== 195959 2013-04-01 05:04:57 -0700 2013-04-04 05:04:14 -0700 Patch bug-112419-20130401140449.patch text/plain 6818 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MzA2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTI2M2JjOGE0ZjY4YTAxZWE3MWI4YTgyZmNiYjA2YTZk MThkNjc1ZS4uMWQ3OTA5YzU1YzhhYWE5Nzg5ZWM2MGRkNmI1YzQxNWZmNDI4YTQxMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDEzLTA0LTAxICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdW1dLMl0gTWluaUJyb3dzZXIgY3VzdG9tIFVSSSBzY2hlbWUgc3Vw cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEy NDE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IHN1cHBvcnQgZm9yIGFib3V0IFVSSXMgaW4gTWluaUJyb3dzZXIuIEFuIGV4YW1wbGUgYWJvdXQg cGFnZSBpcyBzaG93CisgICAgICAgIHdpdGggVVJJICJhYm91dDptaW5pYnJvd3NlciIsIHRoZSBy ZXN0IG9mIHRoZSBjYXNlcyBpdCB3aWxsIHNob3cgYQorICAgICAgICBwcm9wZXIgbWVzc2FnZSBl eHBsYWluaW5nIHRoYXQgdGhlIGFib3V0IHBhZ2UgZGlkbid0IGV4aXN0LgorCisgICAgICAgIElu dGVybmFsbHkgaXQgdXNlcyAibWluaWJyb3dzZXItYWJvdXQiIHByZWZpeCBpbnN0ZWFkIG9mICJh Ym91dCIsIGJ1dAorICAgICAgICBmcm9tIHRoZSB1c2VyIHBvaW50IG9mIHZpZXcgaXQgd29ya3Mg d2l0aCAiYWJvdXQiIHByZWZpeC4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2Vy V2luZG93LmM6IEFkZCBtaW5pQnJvd3NlckFib3V0U2NoZW1lIGNvbnN0YW50LgorICAgICAgICAo Z2V0SW50ZXJuYWxVUkkpOiBNZXRob2QgdG8gY29udmVydCBVUklzIGZyb20gImFib3V0IiBwcmVm aXggdG8KKyAgICAgICAgIm1pbmlicm93c2VyLWFib3V0Ii4KKyAgICAgICAgKGdldEV4dGVybmFs VVJJKTogT3Bwb3NpdGUgbWV0aG9kLgorICAgICAgICAod2ViVmlld1VSSUNoYW5nZWQpOiBVc2Ug ImFib3V0IiBwcmVmaXggdG8gc2hvdyB0aGUgVVJJIHRvIHVzZXJzLgorICAgICAgICAod2ViVmll d0VudGVyRnVsbFNjcmVlbik6IERpdHRvLgorICAgICAgICAoYnJvd3Nlcl93aW5kb3dfbG9hZF91 cmkpOiBVc2UgIm1pbmlicm93c2VyLWFib3V0IiBwcmVmaXggaW50ZXJuYWxseS4KKyAgICAgICAg KiBNaW5pQnJvd3Nlci9ndGsvbWFpbi5jOiBBZGQgbWluaUJyb3dzZXJBYm91dFNjaGVtZSBjb25z dGFudC4KKyAgICAgICAgKGFib3V0VVJJU2NoZW1lUmVxdWVzdENhbGxiYWNrKTogQ2FsbGJhY2sg dG8gbWFuYWdlIGFib3V0IGNhbGxzLgorICAgICAgICAobWFpbik6IFJlZ2lzdGVyIHRoZSBVUkkg c2NoZW1lIHRvIG1hbmFnZSBhYm91dCBVUklzLgorCiAyMDEzLTAzLTMxICBTaGVyaWZmIEJvdCAg PHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByMTQ3Mjg5LgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dz ZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKaW5kZXgg YTViMGNkMzVjNDdjYTc1Yjg4NTc3MWQ4MGU5YWYzZTA2NzBmYzRhNy4uZWJjZTUwNTE0NjAxZDA1 NzQyNjVhNzIyOGZlMDc5OTg2OTZjNTkxNiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIv Z3RrL0Jyb3dzZXJXaW5kb3cuYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3Nlcldp bmRvdy5jCkBAIC02Myw2ICs2Myw3IEBAIHN0cnVjdCBfQnJvd3NlcldpbmRvd0NsYXNzIHsKIH07 CiAKIHN0YXRpYyBjb25zdCBjaGFyICpkZWZhdWx0V2luZG93VGl0bGUgPSAiV2ViS2l0R1RLKyBN aW5pQnJvd3NlciI7CitzdGF0aWMgY29uc3QgY2hhciAqbWluaUJyb3dzZXJBYm91dFNjaGVtZSA9 ICJtaW5pYnJvd3Nlci1hYm91dCI7CiBzdGF0aWMgY29uc3QgZ2RvdWJsZSBtaW5pbXVtWm9vbUxl dmVsID0gMC41Owogc3RhdGljIGNvbnN0IGdkb3VibGUgbWF4aW11bVpvb21MZXZlbCA9IDM7CiBz dGF0aWMgY29uc3QgZ2RvdWJsZSB6b29tU3RlcCA9IDEuMjsKQEAgLTcwLDYgKzcxLDI0IEBAIHN0 YXRpYyBnaW50IHdpbmRvd0NvdW50ID0gMDsKIAogR19ERUZJTkVfVFlQRShCcm93c2VyV2luZG93 LCBicm93c2VyX3dpbmRvdywgR1RLX1RZUEVfV0lORE9XKQogCitzdGF0aWMgY2hhciAqZ2V0SW50 ZXJuYWxVUkkoY29uc3QgY2hhciAqdXJpKQoreworICAgIC8vIEludGVybmFsbHkgd2UgdXNlIG1p bmlicm93c2VyLWFib3V0OiBhcyBhYm91dDogcHJlZml4IGlzIGlnbm9yZWQgYnkgV2ViS2l0Lgor ICAgIGlmIChnX3N0cl9oYXNfcHJlZml4KHVyaSwgImFib3V0OiIpICYmICFnX3N0cl9lcXVhbCh1 cmksICJhYm91dDpibGFuayIpKQorICAgICAgICByZXR1cm4gZ19zdHJjb25jYXQobWluaUJyb3dz ZXJBYm91dFNjaGVtZSwgdXJpICsgc3RybGVuICgiYWJvdXQiKSwgTlVMTCk7CisKKyAgICByZXR1 cm4gZ19zdHJkdXAodXJpKTsKK30KKworc3RhdGljIGNoYXIgKmdldEV4dGVybmFsVVJJKGNvbnN0 IGNoYXIgKnVyaSkKK3sKKyAgICAvLyBGcm9tIHRoZSB1c2VyIHBvaW50IG9mIHZpZXcgd2Ugc3Vw cG9ydCBhYm91dDogcHJlZml4LgorICAgIGlmIChnX3N0cl9oYXNfcHJlZml4KHVyaSwgbWluaUJy b3dzZXJBYm91dFNjaGVtZSkpCisgICAgICAgIHJldHVybiBnX3N0cmNvbmNhdCgiYWJvdXQiLCB1 cmkgKyBzdHJsZW4obWluaUJyb3dzZXJBYm91dFNjaGVtZSksIE5VTEwpOworCisgICAgcmV0dXJu IGdfc3RyZHVwKHVyaSk7Cit9CisKIHN0YXRpYyB2b2lkIGJyb3dzZXJXaW5kb3dTZXRTdGF0dXNU ZXh0KEJyb3dzZXJXaW5kb3cgKndpbmRvdywgY29uc3QgY2hhciAqdGV4dCkKIHsKICNpZiBHVEtf Q0hFQ0tfVkVSU0lPTigzLCAyLCAwKQpAQCAtMTE4LDcgKzEzNyw5IEBAIHN0YXRpYyB2b2lkIHNl dHRpbmdzQ2FsbGJhY2soQnJvd3NlcldpbmRvdyAqd2luZG93KQogCiBzdGF0aWMgdm9pZCB3ZWJW aWV3VVJJQ2hhbmdlZChXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3LCBHUGFyYW1TcGVjICpwc3BlYywg QnJvd3NlcldpbmRvdyAqd2luZG93KQogewotICAgIGd0a19lbnRyeV9zZXRfdGV4dChHVEtfRU5U Ulkod2luZG93LT51cmlFbnRyeSksIHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKHdlYlZpZXcpKTsK KyAgICBjaGFyICpleHRlcm5hbFVSSSA9IGdldEV4dGVybmFsVVJJKHdlYmtpdF93ZWJfdmlld19n ZXRfdXJpKHdlYlZpZXcpKTsKKyAgICBndGtfZW50cnlfc2V0X3RleHQoR1RLX0VOVFJZKHdpbmRv dy0+dXJpRW50cnkpLCBleHRlcm5hbFVSSSk7CisgICAgZ19mcmVlKGV4dGVybmFsVVJJKTsKIH0K IAogc3RhdGljIHZvaWQgd2ViVmlld1RpdGxlQ2hhbmdlZChXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3 LCBHUGFyYW1TcGVjICpwc3BlYywgQnJvd3NlcldpbmRvdyAqd2luZG93KQpAQCAtMjc3LDExICsy OTgsMTIgQEAgc3RhdGljIGdib29sZWFuIGZ1bGxTY3JlZW5NZXNzYWdlVGltZW91dENhbGxiYWNr KEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHN0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3RW50ZXJGdWxs U2NyZWVuKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHsK ICNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAyLCAwKQotICAgIGNvbnN0IGdjaGFyICp0aXRsZU9y VVJJID0gd2Via2l0X3dlYl92aWV3X2dldF90aXRsZSh3aW5kb3ctPndlYlZpZXcpOworICAgIGdj aGFyICp0aXRsZU9yVVJJID0gZ19zdHJkdXAod2Via2l0X3dlYl92aWV3X2dldF90aXRsZSh3aW5k b3ctPndlYlZpZXcpKTsKICAgICBpZiAoIXRpdGxlT3JVUkkpCi0gICAgICAgIHRpdGxlT3JVUkkg PSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaSh3aW5kb3ctPndlYlZpZXcpOworICAgICAgICB0aXRs ZU9yVVJJID0gZ2V0RXh0ZXJuYWxVUkkod2Via2l0X3dlYl92aWV3X2dldF91cmkod2luZG93LT53 ZWJWaWV3KSk7CiAgICAgZ2NoYXIgKm1lc3NhZ2UgPSBnX3N0cmR1cF9wcmludGYoIiVzIGlzIG5v dyBmdWxsIHNjcmVlbi4gUHJlc3MgRVNDIG9yIGYgdG8gZXhpdC4iLCB0aXRsZU9yVVJJKTsKICAg ICBndGtfbGFiZWxfc2V0X3RleHQoR1RLX0xBQkVMKHdpbmRvdy0+ZnVsbFNjcmVlbk1lc3NhZ2VM YWJlbCksIG1lc3NhZ2UpOworICAgIGdfZnJlZSh0aXRsZU9yVVJJKTsKICAgICBnX2ZyZWUobWVz c2FnZSk7CiAKICAgICBndGtfd2lkZ2V0X3Nob3cod2luZG93LT5mdWxsU2NyZWVuTWVzc2FnZUxh YmVsKTsKQEAgLTY0Myw3ICs2NjUsOSBAQCB2b2lkIGJyb3dzZXJfd2luZG93X2xvYWRfdXJpKEJy b3dzZXJXaW5kb3cgKndpbmRvdywgY29uc3QgY2hhciAqdXJpKQogICAgIGdfcmV0dXJuX2lmX2Zh aWwodXJpKTsKIAogICAgIGlmICghZ19zdHJfaGFzX3ByZWZpeCh1cmksICJqYXZhc2NyaXB0OiIp KSB7Ci0gICAgICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaSh3aW5kb3ctPndlYlZpZXcsIHVy aSk7CisgICAgICAgIGNoYXIgKmludGVybmFsVVJJID0gZ2V0SW50ZXJuYWxVUkkodXJpKTsKKyAg ICAgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJpKHdpbmRvdy0+d2ViVmlldywgaW50ZXJuYWxV UkkpOworICAgICAgICBnX2ZyZWUoaW50ZXJuYWxVUkkpOwogICAgICAgICByZXR1cm47CiAgICAg fQogCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jIGIvVG9vbHMvTWlu aUJyb3dzZXIvZ3RrL21haW4uYwppbmRleCAxN2U0NmY0OWFiNDRhYzAzYTE5NzBhNmIyZGIwNDU5 ZmU1ZGMyYzg1Li41ZjdhYmJmNDU0NzNlNDQzZTFmYjYzMGY0ZjQxMDE4MTk2YjBlNzI5IDEwMDY0 NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jCisrKyBiL1Rvb2xzL01pbmlCcm93 c2VyL2d0ay9tYWluLmMKQEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRlIDx3ZWJraXQyL3dlYmtp dDIuaD4KIAogc3RhdGljIGNvbnN0IGdjaGFyICoqdXJpQXJndW1lbnRzID0gTlVMTDsKK3N0YXRp YyBjb25zdCBjaGFyICptaW5pQnJvd3NlckFib3V0U2NoZW1lID0gIm1pbmlicm93c2VyLWFib3V0 IjsKIAogc3RhdGljIGdjaGFyICphcmd1bWVudFRvVVJMKGNvbnN0IGNoYXIgKmZpbGVuYW1lKQog ewpAQCAtMTk4LDYgKzE5OSwzMCBAQCBzdGF0aWMgZ2Jvb2xlYW4gYWRkU2V0dGluZ3NHcm91cFRv Q29udGV4dChHT3B0aW9uQ29udGV4dCAqY29udGV4dCwgV2ViS2l0U2V0dGluZwogICAgIHJldHVy biBUUlVFOwogfQogCitzdGF0aWMgdm9pZAorYWJvdXRVUklTY2hlbWVSZXF1ZXN0Q2FsbGJhY2so V2ViS2l0VVJJU2NoZW1lUmVxdWVzdCAqcmVxdWVzdCwgZ3BvaW50ZXIgdXNlckRhdGEpCit7Cisg ICAgR0lucHV0U3RyZWFtICpzdHJlYW07CisgICAgZ3NpemUgc3RyZWFtTGVuZ3RoOworICAgIGNv bnN0IGdjaGFyICpwYXRoOworICAgIGdjaGFyICpjb250ZW50czsKKworICAgIHBhdGggPSB3ZWJr aXRfdXJpX3NjaGVtZV9yZXF1ZXN0X2dldF9wYXRoKHJlcXVlc3QpOworICAgIGlmICghZ19zdHJj bXAwKHBhdGgsICJtaW5pYnJvd3NlciIpKQorICAgICAgICBjb250ZW50cyA9IGdfc3RyZHVwX3By aW50ZigiPGh0bWw+PGJvZHk+PGgxPldlYktpdEdUSysgTWluaUJyb3dzZXI8L2gxPjxwPlRoZSBX ZWJLaXQyIHRlc3QgYnJvd3NlciBvZiB0aGUgR1RLKyBwb3J0LjwvcD48cD5XZWJLaXQgdmVyc2lv bjogJWQuJWQuJWQ8L3A+PC9ib2R5PjwvaHRtbD4iLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB3ZWJraXRfZ2V0X21ham9yX3ZlcnNpb24oKSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgd2Via2l0X2dldF9taW5vcl92ZXJzaW9uKCksCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHdlYmtpdF9nZXRfbWljcm9fdmVyc2lvbigpKTsKKyAg ICBlbHNlCisgICAgICAgIGNvbnRlbnRzID0gZ19zdHJkdXBfcHJpbnRmKCI8aHRtbD48Ym9keT48 cD5JbnZhbGlkIGFib3V0OiVzIHBhZ2UuPC9wPjwvYm9keT48L2h0bWw+IiwgcGF0aCk7CisKKyAg ICBzdHJlYW1MZW5ndGggPSBzdHJsZW4oY29udGVudHMpOworICAgIHN0cmVhbSA9IGdfbWVtb3J5 X2lucHV0X3N0cmVhbV9uZXdfZnJvbV9kYXRhKGNvbnRlbnRzLCBzdHJlYW1MZW5ndGgsIGdfZnJl ZSk7CisKKyAgICB3ZWJraXRfdXJpX3NjaGVtZV9yZXF1ZXN0X2ZpbmlzaChyZXF1ZXN0LCBzdHJl YW0sIHN0cmVhbUxlbmd0aCwgInRleHQvaHRtbCIpOworICAgIGdfb2JqZWN0X3VucmVmKHN0cmVh bSk7Cit9CisKIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiB7CiAgICAgZ3RrX2lu aXQoJmFyZ2MsICZhcmd2KTsKQEAgLTIzMSw2ICsyNTYsOCBAQCBpbnQgbWFpbihpbnQgYXJnYywg Y2hhciAqYXJndltdKQogICAgIC8vIEVuYWJsZSB0aGUgZmF2aWNvbiBkYXRhYmFzZSwgYnkgc3Bl Y2lmeWluZyB0aGUgZGVmYXVsdCBkaXJlY3RvcnkuCiAgICAgd2Via2l0X3dlYl9jb250ZXh0X3Nl dF9mYXZpY29uX2RhdGFiYXNlX2RpcmVjdG9yeSh3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X2RlZmF1 bHQoKSwgTlVMTCk7CiAKKyAgICB3ZWJraXRfd2ViX2NvbnRleHRfcmVnaXN0ZXJfdXJpX3NjaGVt ZSh3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X2RlZmF1bHQoKSwgbWluaUJyb3dzZXJBYm91dFNjaGVt ZSwgYWJvdXRVUklTY2hlbWVSZXF1ZXN0Q2FsbGJhY2ssIE5VTEwsIE5VTEwpOworCiAgICAgaWYg KHVyaUFyZ3VtZW50cykgewogICAgICAgICBpbnQgaTsKIAo= 196467 2013-04-04 05:04:22 -0700 2013-04-04 06:24:48 -0700 Patch bug-112419-20130404140410.patch text/plain 6749 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MzA2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTI2M2JjOGE0ZjY4YTAxZWE3MWI4YTgyZmNiYjA2YTZk MThkNjc1ZS4uMWQ3OTA5YzU1YzhhYWE5Nzg5ZWM2MGRkNmI1YzQxNWZmNDI4YTQxMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDEzLTA0LTAxICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdW1dLMl0gTWluaUJyb3dzZXIgY3VzdG9tIFVSSSBzY2hlbWUgc3Vw cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEy NDE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IHN1cHBvcnQgZm9yIGFib3V0IFVSSXMgaW4gTWluaUJyb3dzZXIuIEFuIGV4YW1wbGUgYWJvdXQg cGFnZSBpcyBzaG93CisgICAgICAgIHdpdGggVVJJICJhYm91dDptaW5pYnJvd3NlciIsIHRoZSBy ZXN0IG9mIHRoZSBjYXNlcyBpdCB3aWxsIHNob3cgYQorICAgICAgICBwcm9wZXIgbWVzc2FnZSBl eHBsYWluaW5nIHRoYXQgdGhlIGFib3V0IHBhZ2UgZGlkbid0IGV4aXN0LgorCisgICAgICAgIElu dGVybmFsbHkgaXQgdXNlcyAibWluaWJyb3dzZXItYWJvdXQiIHByZWZpeCBpbnN0ZWFkIG9mICJh Ym91dCIsIGJ1dAorICAgICAgICBmcm9tIHRoZSB1c2VyIHBvaW50IG9mIHZpZXcgaXQgd29ya3Mg d2l0aCAiYWJvdXQiIHByZWZpeC4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2Vy V2luZG93LmM6IEFkZCBtaW5pQnJvd3NlckFib3V0U2NoZW1lIGNvbnN0YW50LgorICAgICAgICAo Z2V0SW50ZXJuYWxVUkkpOiBNZXRob2QgdG8gY29udmVydCBVUklzIGZyb20gImFib3V0IiBwcmVm aXggdG8KKyAgICAgICAgIm1pbmlicm93c2VyLWFib3V0Ii4KKyAgICAgICAgKGdldEV4dGVybmFs VVJJKTogT3Bwb3NpdGUgbWV0aG9kLgorICAgICAgICAod2ViVmlld1VSSUNoYW5nZWQpOiBVc2Ug ImFib3V0IiBwcmVmaXggdG8gc2hvdyB0aGUgVVJJIHRvIHVzZXJzLgorICAgICAgICAod2ViVmll d0VudGVyRnVsbFNjcmVlbik6IERpdHRvLgorICAgICAgICAoYnJvd3Nlcl93aW5kb3dfbG9hZF91 cmkpOiBVc2UgIm1pbmlicm93c2VyLWFib3V0IiBwcmVmaXggaW50ZXJuYWxseS4KKyAgICAgICAg KiBNaW5pQnJvd3Nlci9ndGsvbWFpbi5jOiBBZGQgbWluaUJyb3dzZXJBYm91dFNjaGVtZSBjb25z dGFudC4KKyAgICAgICAgKGFib3V0VVJJU2NoZW1lUmVxdWVzdENhbGxiYWNrKTogQ2FsbGJhY2sg dG8gbWFuYWdlIGFib3V0IGNhbGxzLgorICAgICAgICAobWFpbik6IFJlZ2lzdGVyIHRoZSBVUkkg c2NoZW1lIHRvIG1hbmFnZSBhYm91dCBVUklzLgorCiAyMDEzLTAzLTMxICBTaGVyaWZmIEJvdCAg PHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByMTQ3Mjg5LgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dz ZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKaW5kZXgg YTViMGNkMzVjNDdjYTc1Yjg4NTc3MWQ4MGU5YWYzZTA2NzBmYzRhNy4uZWJjZTUwNTE0NjAxZDA1 NzQyNjVhNzIyOGZlMDc5OTg2OTZjNTkxNiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIv Z3RrL0Jyb3dzZXJXaW5kb3cuYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3Nlcldp bmRvdy5jCkBAIC02Myw2ICs2Myw3IEBAIHN0cnVjdCBfQnJvd3NlcldpbmRvd0NsYXNzIHsKIH07 CiAKIHN0YXRpYyBjb25zdCBjaGFyICpkZWZhdWx0V2luZG93VGl0bGUgPSAiV2ViS2l0R1RLKyBN aW5pQnJvd3NlciI7CitzdGF0aWMgY29uc3QgY2hhciAqbWluaUJyb3dzZXJBYm91dFNjaGVtZSA9 ICJtaW5pYnJvd3Nlci1hYm91dCI7CiBzdGF0aWMgY29uc3QgZ2RvdWJsZSBtaW5pbXVtWm9vbUxl dmVsID0gMC41Owogc3RhdGljIGNvbnN0IGdkb3VibGUgbWF4aW11bVpvb21MZXZlbCA9IDM7CiBz dGF0aWMgY29uc3QgZ2RvdWJsZSB6b29tU3RlcCA9IDEuMjsKQEAgLTcwLDYgKzcxLDI0IEBAIHN0 YXRpYyBnaW50IHdpbmRvd0NvdW50ID0gMDsKIAogR19ERUZJTkVfVFlQRShCcm93c2VyV2luZG93 LCBicm93c2VyX3dpbmRvdywgR1RLX1RZUEVfV0lORE9XKQogCitzdGF0aWMgY2hhciAqZ2V0SW50 ZXJuYWxVUkkoY29uc3QgY2hhciAqdXJpKQoreworICAgIC8vIEludGVybmFsbHkgd2UgdXNlIG1p bmlicm93c2VyLWFib3V0OiBhcyBhYm91dDogcHJlZml4IGlzIGlnbm9yZWQgYnkgV2ViS2l0Lgor ICAgIGlmIChnX3N0cl9oYXNfcHJlZml4KHVyaSwgImFib3V0OiIpICYmICFnX3N0cl9lcXVhbCh1 cmksICJhYm91dDpibGFuayIpKQorICAgICAgICByZXR1cm4gZ19zdHJjb25jYXQobWluaUJyb3dz ZXJBYm91dFNjaGVtZSwgdXJpICsgc3RybGVuICgiYWJvdXQiKSwgTlVMTCk7CisKKyAgICByZXR1 cm4gZ19zdHJkdXAodXJpKTsKK30KKworc3RhdGljIGNoYXIgKmdldEV4dGVybmFsVVJJKGNvbnN0 IGNoYXIgKnVyaSkKK3sKKyAgICAvLyBGcm9tIHRoZSB1c2VyIHBvaW50IG9mIHZpZXcgd2Ugc3Vw cG9ydCBhYm91dDogcHJlZml4LgorICAgIGlmIChnX3N0cl9oYXNfcHJlZml4KHVyaSwgbWluaUJy b3dzZXJBYm91dFNjaGVtZSkpCisgICAgICAgIHJldHVybiBnX3N0cmNvbmNhdCgiYWJvdXQiLCB1 cmkgKyBzdHJsZW4obWluaUJyb3dzZXJBYm91dFNjaGVtZSksIE5VTEwpOworCisgICAgcmV0dXJu IGdfc3RyZHVwKHVyaSk7Cit9CisKIHN0YXRpYyB2b2lkIGJyb3dzZXJXaW5kb3dTZXRTdGF0dXNU ZXh0KEJyb3dzZXJXaW5kb3cgKndpbmRvdywgY29uc3QgY2hhciAqdGV4dCkKIHsKICNpZiBHVEtf Q0hFQ0tfVkVSU0lPTigzLCAyLCAwKQpAQCAtMTE4LDcgKzEzNyw5IEBAIHN0YXRpYyB2b2lkIHNl dHRpbmdzQ2FsbGJhY2soQnJvd3NlcldpbmRvdyAqd2luZG93KQogCiBzdGF0aWMgdm9pZCB3ZWJW aWV3VVJJQ2hhbmdlZChXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3LCBHUGFyYW1TcGVjICpwc3BlYywg QnJvd3NlcldpbmRvdyAqd2luZG93KQogewotICAgIGd0a19lbnRyeV9zZXRfdGV4dChHVEtfRU5U Ulkod2luZG93LT51cmlFbnRyeSksIHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKHdlYlZpZXcpKTsK KyAgICBjaGFyICpleHRlcm5hbFVSSSA9IGdldEV4dGVybmFsVVJJKHdlYmtpdF93ZWJfdmlld19n ZXRfdXJpKHdlYlZpZXcpKTsKKyAgICBndGtfZW50cnlfc2V0X3RleHQoR1RLX0VOVFJZKHdpbmRv dy0+dXJpRW50cnkpLCBleHRlcm5hbFVSSSk7CisgICAgZ19mcmVlKGV4dGVybmFsVVJJKTsKIH0K IAogc3RhdGljIHZvaWQgd2ViVmlld1RpdGxlQ2hhbmdlZChXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3 LCBHUGFyYW1TcGVjICpwc3BlYywgQnJvd3NlcldpbmRvdyAqd2luZG93KQpAQCAtMjc3LDExICsy OTgsMTIgQEAgc3RhdGljIGdib29sZWFuIGZ1bGxTY3JlZW5NZXNzYWdlVGltZW91dENhbGxiYWNr KEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHN0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3RW50ZXJGdWxs U2NyZWVuKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHsK ICNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAyLCAwKQotICAgIGNvbnN0IGdjaGFyICp0aXRsZU9y VVJJID0gd2Via2l0X3dlYl92aWV3X2dldF90aXRsZSh3aW5kb3ctPndlYlZpZXcpOworICAgIGdj aGFyICp0aXRsZU9yVVJJID0gZ19zdHJkdXAod2Via2l0X3dlYl92aWV3X2dldF90aXRsZSh3aW5k b3ctPndlYlZpZXcpKTsKICAgICBpZiAoIXRpdGxlT3JVUkkpCi0gICAgICAgIHRpdGxlT3JVUkkg PSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaSh3aW5kb3ctPndlYlZpZXcpOworICAgICAgICB0aXRs ZU9yVVJJID0gZ2V0RXh0ZXJuYWxVUkkod2Via2l0X3dlYl92aWV3X2dldF91cmkod2luZG93LT53 ZWJWaWV3KSk7CiAgICAgZ2NoYXIgKm1lc3NhZ2UgPSBnX3N0cmR1cF9wcmludGYoIiVzIGlzIG5v dyBmdWxsIHNjcmVlbi4gUHJlc3MgRVNDIG9yIGYgdG8gZXhpdC4iLCB0aXRsZU9yVVJJKTsKICAg ICBndGtfbGFiZWxfc2V0X3RleHQoR1RLX0xBQkVMKHdpbmRvdy0+ZnVsbFNjcmVlbk1lc3NhZ2VM YWJlbCksIG1lc3NhZ2UpOworICAgIGdfZnJlZSh0aXRsZU9yVVJJKTsKICAgICBnX2ZyZWUobWVz c2FnZSk7CiAKICAgICBndGtfd2lkZ2V0X3Nob3cod2luZG93LT5mdWxsU2NyZWVuTWVzc2FnZUxh YmVsKTsKQEAgLTY0Myw3ICs2NjUsOSBAQCB2b2lkIGJyb3dzZXJfd2luZG93X2xvYWRfdXJpKEJy b3dzZXJXaW5kb3cgKndpbmRvdywgY29uc3QgY2hhciAqdXJpKQogICAgIGdfcmV0dXJuX2lmX2Zh aWwodXJpKTsKIAogICAgIGlmICghZ19zdHJfaGFzX3ByZWZpeCh1cmksICJqYXZhc2NyaXB0OiIp KSB7Ci0gICAgICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaSh3aW5kb3ctPndlYlZpZXcsIHVy aSk7CisgICAgICAgIGNoYXIgKmludGVybmFsVVJJID0gZ2V0SW50ZXJuYWxVUkkodXJpKTsKKyAg ICAgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJpKHdpbmRvdy0+d2ViVmlldywgaW50ZXJuYWxV UkkpOworICAgICAgICBnX2ZyZWUoaW50ZXJuYWxVUkkpOwogICAgICAgICByZXR1cm47CiAgICAg fQogCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jIGIvVG9vbHMvTWlu aUJyb3dzZXIvZ3RrL21haW4uYwppbmRleCAxN2U0NmY0OWFiNDRhYzAzYTE5NzBhNmIyZGIwNDU5 ZmU1ZGMyYzg1Li4zN2M5MmMxNmRkNmU1MGMyNDIzYmRiMjkyMTk1ZjliY2MwZmZlYTk3IDEwMDY0 NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jCisrKyBiL1Rvb2xzL01pbmlCcm93 c2VyL2d0ay9tYWluLmMKQEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRlIDx3ZWJraXQyL3dlYmtp dDIuaD4KIAogc3RhdGljIGNvbnN0IGdjaGFyICoqdXJpQXJndW1lbnRzID0gTlVMTDsKK3N0YXRp YyBjb25zdCBjaGFyICptaW5pQnJvd3NlckFib3V0U2NoZW1lID0gIm1pbmlicm93c2VyLWFib3V0 IjsKIAogc3RhdGljIGdjaGFyICphcmd1bWVudFRvVVJMKGNvbnN0IGNoYXIgKmZpbGVuYW1lKQog ewpAQCAtMTk4LDYgKzE5OSwzMCBAQCBzdGF0aWMgZ2Jvb2xlYW4gYWRkU2V0dGluZ3NHcm91cFRv Q29udGV4dChHT3B0aW9uQ29udGV4dCAqY29udGV4dCwgV2ViS2l0U2V0dGluZwogICAgIHJldHVy biBUUlVFOwogfQogCitzdGF0aWMgdm9pZAorYWJvdXRVUklTY2hlbWVSZXF1ZXN0Q2FsbGJhY2so V2ViS2l0VVJJU2NoZW1lUmVxdWVzdCAqcmVxdWVzdCwgZ3BvaW50ZXIgdXNlckRhdGEpCit7Cisg ICAgR0lucHV0U3RyZWFtICpzdHJlYW07CisgICAgZ3NpemUgc3RyZWFtTGVuZ3RoOworICAgIGNv bnN0IGdjaGFyICpwYXRoOworICAgIGdjaGFyICpjb250ZW50czsKKworICAgIHBhdGggPSB3ZWJr aXRfdXJpX3NjaGVtZV9yZXF1ZXN0X2dldF9wYXRoKHJlcXVlc3QpOworICAgIGlmICghZ19zdHJj bXAwKHBhdGgsICJtaW5pYnJvd3NlciIpKQorICAgICAgICBjb250ZW50cyA9IGdfc3RyZHVwX3By aW50ZigiPGh0bWw+PGJvZHk+PGgxPldlYktpdEdUSysgTWluaUJyb3dzZXI8L2gxPjxwPlRoZSBX ZWJLaXQyIHRlc3QgYnJvd3NlciBvZiB0aGUgR1RLKyBwb3J0LjwvcD48cD5XZWJLaXQgdmVyc2lv bjogJWQuJWQuJWQ8L3A+PC9ib2R5PjwvaHRtbD4iLAorICAgICAgICAgICAgd2Via2l0X2dldF9t YWpvcl92ZXJzaW9uKCksCisgICAgICAgICAgICB3ZWJraXRfZ2V0X21pbm9yX3ZlcnNpb24oKSwK KyAgICAgICAgICAgIHdlYmtpdF9nZXRfbWljcm9fdmVyc2lvbigpKTsKKyAgICBlbHNlCisgICAg ICAgIGNvbnRlbnRzID0gZ19zdHJkdXBfcHJpbnRmKCI8aHRtbD48Ym9keT48cD5JbnZhbGlkIGFi b3V0OiVzIHBhZ2UuPC9wPjwvYm9keT48L2h0bWw+IiwgcGF0aCk7CisKKyAgICBzdHJlYW1MZW5n dGggPSBzdHJsZW4oY29udGVudHMpOworICAgIHN0cmVhbSA9IGdfbWVtb3J5X2lucHV0X3N0cmVh bV9uZXdfZnJvbV9kYXRhKGNvbnRlbnRzLCBzdHJlYW1MZW5ndGgsIGdfZnJlZSk7CisKKyAgICB3 ZWJraXRfdXJpX3NjaGVtZV9yZXF1ZXN0X2ZpbmlzaChyZXF1ZXN0LCBzdHJlYW0sIHN0cmVhbUxl bmd0aCwgInRleHQvaHRtbCIpOworICAgIGdfb2JqZWN0X3VucmVmKHN0cmVhbSk7Cit9CisKIGlu dCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiB7CiAgICAgZ3RrX2luaXQoJmFyZ2MsICZh cmd2KTsKQEAgLTIzMSw2ICsyNTYsOCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltd KQogICAgIC8vIEVuYWJsZSB0aGUgZmF2aWNvbiBkYXRhYmFzZSwgYnkgc3BlY2lmeWluZyB0aGUg ZGVmYXVsdCBkaXJlY3RvcnkuCiAgICAgd2Via2l0X3dlYl9jb250ZXh0X3NldF9mYXZpY29uX2Rh dGFiYXNlX2RpcmVjdG9yeSh3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X2RlZmF1bHQoKSwgTlVMTCk7 CiAKKyAgICB3ZWJraXRfd2ViX2NvbnRleHRfcmVnaXN0ZXJfdXJpX3NjaGVtZSh3ZWJraXRfd2Vi X2NvbnRleHRfZ2V0X2RlZmF1bHQoKSwgbWluaUJyb3dzZXJBYm91dFNjaGVtZSwgYWJvdXRVUklT Y2hlbWVSZXF1ZXN0Q2FsbGJhY2ssIE5VTEwsIE5VTEwpOworCiAgICAgaWYgKHVyaUFyZ3VtZW50 cykgewogICAgICAgICBpbnQgaTsKIAo=