122681 2013-10-11 15:52:16 -0700 [GTK] Search functionality in MiniBrowser provides feedback on search fail 2013-11-25 16:18:35 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 agomez webkit-unassigned agomez cgarcia commit-queue mario oldest_to_newest 938996 0 agomez 2013-10-11 15:52:16 -0700 When searching in MiniBrowser, if the search is failing, show some kind of feedback. Useful for testing bugs. 939001 1 214034 agomez 2013-10-11 16:14:36 -0700 Created attachment 214034 Patch 953956 2 214034 mario 2013-11-25 04:12:45 -0800 Comment on attachment 214034 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=214034&action=review I think it's a good idea, I would just do a small change in the code. See it below... > Tools/MiniBrowser/gtk/BrowserSearchBar.c:46 > +static void setEntryBackgroundColor(BrowserSearchBar *searchBar, gboolean failedSearch) This function is named setEntryBackgroundColor(), but it does not set any color at all, just specifies whether the search failed (so the color is set accordingly). So, I think you either rename it to something that makes more sense according to the bool parameter (e.g. setFailedStyleForEntry()), so the bool TRUE means "failed" and FALSE means "ok/default", or you go further to even avoid the bool parameter by declaring a new enum with ENTRY_STYLE_DEFAULT/OK/FAIL values (for instance) to be passed to the function, which maybe I would rename then to setStyleForEntry(). For MiniBrowser, I do not have any special preference over those. Any option would be ok to me :) 953981 3 217799 agomez 2013-11-25 05:54:54 -0800 Created attachment 217799 Patch 953982 4 agomez 2013-11-25 05:56:42 -0800 Thanks for the review! (In reply to comment #2) ... > So, I think you either rename it to something that makes more sense according to the bool parameter (e.g. setFailedStyleForEntry()), so the bool TRUE means "failed" and FALSE means Done. 953987 5 217799 mario 2013-11-25 06:13:59 -0800 Comment on attachment 217799 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217799&action=review Sorry Andres not to have catched the following issues in the previous review. Looks good anyway, just "one more thing"... > Tools/MiniBrowser/gtk/BrowserSearchBar.c:35 > + GtkCssProvider *cssProvider; > + const gchar* failStyle; Wrong * location for failStyle. Also, I think that we normally use char instead of gchar for internal variables > Tools/MiniBrowser/gtk/BrowserSearchBar.c:51 > + if (failedSearch) > + gtk_css_provider_load_from_data(searchBar->cssProvider, searchBar->failStyle, -1, NULL); > + else > + gtk_css_provider_load_from_data(searchBar->cssProvider, "", -1, NULL); That's more of a personal preference I think, but I'd use the ternary operator here > Tools/MiniBrowser/gtk/BrowserSearchBar.c:169 > + searchBar->failStyle = " GtkEntry#searchEntry {\n" > + " background-color: #ff6666;\n" > + "}\n"; What about putting this string in one line only (no \n) and moving its definition to a global const (static const char*) up in this file, right after the priv struct? 953988 6 mario 2013-11-25 06:19:27 -0800 (In reply to comment #5) > [...] > > Tools/MiniBrowser/gtk/BrowserSearchBar.c:35 > > + GtkCssProvider *cssProvider; > > + const gchar* failStyle; > > Wrong * location for failStyle. > > Also, I think that we normally use char instead of gchar for internal variables > > > Tools/MiniBrowser/gtk/BrowserSearchBar.c:51 > > + if (failedSearch) > > + gtk_css_provider_load_from_data(searchBar->cssProvider, searchBar->failStyle, -1, NULL); > > + else > > + gtk_css_provider_load_from_data(searchBar->cssProvider, "", -1, NULL); > > That's more of a personal preference I think, but I'd use the ternary operator here > > > > Tools/MiniBrowser/gtk/BrowserSearchBar.c:169 > > + searchBar->failStyle = " GtkEntry#searchEntry {\n" > > + " background-color: #ff6666;\n" > > + "}\n"; > > What about putting this string in one line only (no \n) and moving its > definition to a global const (static const char*) up in this file, > right after the priv struct? Actually, I just realized that you don't need to keep the const char for failStyle in the private struct at all if you follow this advice :) 954040 7 217817 agomez 2013-11-25 10:36:48 -0800 Created attachment 217817 Patch 954043 8 agomez 2013-11-25 10:38:14 -0800 (In reply to comment #5) > > Tools/MiniBrowser/gtk/BrowserSearchBar.c:51 > > + if (failedSearch) > > + gtk_css_provider_load_from_data(searchBar->cssProvider, searchBar->failStyle, -1, NULL); > > + else > > + gtk_css_provider_load_from_data(searchBar->cssProvider, "", -1, NULL); Done. > That's more of a personal preference I think, but I'd use the ternary operator here > > > Tools/MiniBrowser/gtk/BrowserSearchBar.c:169 > > + searchBar->failStyle = " GtkEntry#searchEntry {\n" > > + " background-color: #ff6666;\n" > > + "}\n"; > > What about putting this string in one line only (no \n) and moving its definition to a global const (static const char*) up in this file, right after the priv struct? Done. (In reply to comment #6) ... > Actually, I just realized that you don't need to keep the const char for failStyle in the private struct at all if you follow this advice :) Done. 954143 9 217817 mario 2013-11-25 15:50:19 -0800 Comment on attachment 217817 Patch lgtm 954152 10 217817 commit-queue 2013-11-25 16:18:33 -0800 Comment on attachment 217817 Patch Clearing flags on attachment: 217817 Committed r159774: <http://trac.webkit.org/changeset/159774> 954153 11 commit-queue 2013-11-25 16:18:35 -0800 All reviewed patches have been landed. Closing bug. 214034 2013-10-11 16:14:36 -0700 2013-11-25 05:54:34 -0800 Patch bug-122681-20131012021434.patch text/plain 5402 agomez U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3Mjk5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGM5MmQxYTRlNjMzNGNiZDAxNDE3ZGQ5ZTM1YWIyMDUw ODc3MzE4Yi4uYzkxODljOTA0NDdiMWMzNjJiZmMxOTQzYWExYjM0MGNhYTcyMjg1OCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDEzLTEwLTExICBBbmRyZXMgR29tZXogIDxhZ29tZXpAaWdhbGlhLmNvbT4KKworICAg ICAgICBbR1RLXSBTZWFyY2ggZnVuY3Rpb25hbGl0eSBpbiBNaW5pQnJvd3NlciBwcm92aWRlcyBm ZWVkYmFjayBvbiBzZWFyY2ggZmFpbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIyNjgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2hlbiB1c2luZyB0aGUgc2VhcmNoIGZ1bmN0aW9uYWxpdHkgaW4gTWlu aUJyb3dzZXIsIGlmIHRoZSBzZWFyY2gKKyAgICAgICAgZmFpbHMsIHRoZSBlbnRyeSBiYWNrZ3Jv dW5kIGNvbG9yIGdldHMgcmVkIHRvIHJlcG9ydCB0aGUgdXNlcgorICAgICAgICBhYm91dCB0aGUg ZmFpbGluZyBjb25kaXRpb24uIFdoZW4gdGhlIGVudHJ5IGlzIGNsZWFuZWQgb3IgdGhlCisgICAg ICAgIHNlYXJjaCBpcyBhZ2FpbiBzdWNjZXNmdWwgdGhlIGJhY2tncm91bmQgdHVybnMgYmFjayB0 byBpdHMKKyAgICAgICAgb3JpZ2luYWwgY29sb3IuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9n dGsvQnJvd3NlclNlYXJjaEJhci5jOgorICAgICAgICAoc2V0RW50cnlCYWNrZ3JvdW5kQ29sb3Ip OiBBZGRlZC4KKyAgICAgICAgKGRvU2VhcmNoKTogU2V0cyB0aGUgZW50cnkncyBiYWNrZ3JvdW5k IHRvIGl0cyBvcmlnaW5hbCBjb2xvciBpZgorICAgICAgICB0aGVyZSBpcyBubyB0ZXh0IHRvIHNl YXJjaC4KKyAgICAgICAgKGZpbmRDb250cm9sbGVyRmFpbGVkVG9GaW5kVGV4dENhbGxiYWNrKTog QWRkZWQuCisgICAgICAgIChmaW5kQ29udHJvbGxlckZvdW5kVGV4dENhbGxiYWNrKTogQWRkZWQu CisgICAgICAgIChicm93c2VyX3NlYXJjaF9iYXJfaW5pdCk6IENyZWF0ZXMgYW5kIGFkZHMgYSBu ZXcgQ1NTIHByb3ZpZGVyIHRvCisgICAgICAgIHRoZSB0ZXh0IGVudHJ5IHNvIHdlIGNhbiBjaGFu Z2UgaXRzIHN0eWxlIGJhc2VkIG9uIHRoZSBzdWNjZXNzCisgICAgICAgIGNvbmRpdGlvbiBvZiB0 aGUgc2VhcmNoLiBBbHNvLCBzZXRzIHRoZSBzdHlsZSBmb3IgdGhlIGZhaWxpbmcKKyAgICAgICAg Y2FzZS4KKyAgICAgICAgKGJyb3dzZXJTZWFyY2hCYXJGaW5hbGl6ZSk6IEZyZWVzIHRoZSBuZXcg Q1NTIHByb3ZpZGVyLgorICAgICAgICAoYnJvd3Nlcl9zZWFyY2hfYmFyX25ldyk6IENvbm5lY3Rz IHRoZSB0d28gbmV3IGhhbmRsZXJzIHRvIHRoZQorICAgICAgICAiZmFpbGVkLXRvLWZpbmQtdGV4 dCIgYW5kICJmb3VuZC10ZXh0IiBzaWduYWxzIGVtaXR0ZWQgYnkgdGhlCisgICAgICAgIFdlYktp dEZpbmRDb250cm9sbGVyLgorCiAyMDEzLTEwLTEwICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxn dXN0YXZvLm5vcm9uaGFAY29sbGFib3JhLmNvbT4KIAogICAgICAgICB3ZWJraXQtcGF0Y2ggZmFp bHVyZS1yZWFzb24gaGFzIGEgcXVpdGUgbG93IGxpbWl0IGZvciAndG9vIG1hbnkgZmFpbHVyZXMn CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlclNlYXJjaEJhci5jIGIv VG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJTZWFyY2hCYXIuYwppbmRleCBlMzNlNGM1ZDA3 ZmE4NTU4YzliMWE4Y2EwMmE5ZGY2ODE4ZWZhMTM5Li5iNzZlNzlkNWQ5ZWJkZGFkMWRmZThiOTcz MmYwNzk0ZTZlOWE3MTJlIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3Nl clNlYXJjaEJhci5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyU2VhcmNoQmFy LmMKQEAgLTMxLDYgKzMxLDggQEAgc3RydWN0IF9Ccm93c2VyU2VhcmNoQmFyIHsKIAogICAgIFdl YktpdFdlYlZpZXcgKndlYlZpZXc7CiAgICAgR3RrV2lkZ2V0ICplbnRyeTsKKyAgICBHdGtDc3NQ cm92aWRlciAqY3NzUHJvdmlkZXI7CisgICAgY29uc3QgZ2NoYXIqIGZhaWxTdHlsZTsKICAgICBH dGtXaWRnZXQgKnByZXZCdXR0b247CiAgICAgR3RrV2lkZ2V0ICpuZXh0QnV0dG9uOwogICAgIEd0 a1dpZGdldCAqb3B0aW9uc01lbnU7CkBAIC00MSw2ICs0MywxNCBAQCBzdHJ1Y3QgX0Jyb3dzZXJT ZWFyY2hCYXIgewogCiBHX0RFRklORV9UWVBFKEJyb3dzZXJTZWFyY2hCYXIsIGJyb3dzZXJfc2Vh cmNoX2JhciwgR1RLX1RZUEVfVE9PTEJBUikKIAorc3RhdGljIHZvaWQgc2V0RW50cnlCYWNrZ3Jv dW5kQ29sb3IoQnJvd3NlclNlYXJjaEJhciAqc2VhcmNoQmFyLCBnYm9vbGVhbiBmYWlsZWRTZWFy Y2gpCit7CisgICAgaWYgKGZhaWxlZFNlYXJjaCkKKyAgICAgICAgZ3RrX2Nzc19wcm92aWRlcl9s b2FkX2Zyb21fZGF0YShzZWFyY2hCYXItPmNzc1Byb3ZpZGVyLCBzZWFyY2hCYXItPmZhaWxTdHls ZSwgLTEsIE5VTEwpOworICAgIGVsc2UKKyAgICAgICAgZ3RrX2Nzc19wcm92aWRlcl9sb2FkX2Zy b21fZGF0YShzZWFyY2hCYXItPmNzc1Byb3ZpZGVyLCAiIiwgLTEsIE5VTEwpOworfQorCiBzdGF0 aWMgdm9pZCBkb1NlYXJjaChCcm93c2VyU2VhcmNoQmFyICpzZWFyY2hCYXIpCiB7CiAgICAgR3Rr RW50cnkgKmVudHJ5ID0gR1RLX0VOVFJZKHNlYXJjaEJhci0+ZW50cnkpOwpAQCAtNDgsNiArNTgs NyBAQCBzdGF0aWMgdm9pZCBkb1NlYXJjaChCcm93c2VyU2VhcmNoQmFyICpzZWFyY2hCYXIpCiAg ICAgaWYgKCFndGtfZW50cnlfZ2V0X3RleHRfbGVuZ3RoKGVudHJ5KSkgewogICAgICAgICB3ZWJr aXRfZmluZF9jb250cm9sbGVyX3NlYXJjaF9maW5pc2god2Via2l0X3dlYl92aWV3X2dldF9maW5k X2NvbnRyb2xsZXIoc2VhcmNoQmFyLT53ZWJWaWV3KSk7CiAgICAgICAgIGd0a19lbnRyeV9zZXRf aWNvbl9mcm9tX3N0b2NrKGVudHJ5LCBHVEtfRU5UUllfSUNPTl9TRUNPTkRBUlksIE5VTEwpOwor ICAgICAgICBzZXRFbnRyeUJhY2tncm91bmRDb2xvcihzZWFyY2hCYXIsIEZBTFNFKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTIwLDYgKzEzMSwxNiBAQCBzdGF0aWMgdm9pZCBzZWFy Y2hNZW51Q2hlY2tCdXR0b25Ub2dnbGVkQ2FsbGJhY2soQnJvd3NlclNlYXJjaEJhciAqc2VhcmNo QmFyKQogICAgIGRvU2VhcmNoKHNlYXJjaEJhcik7CiB9CiAKK3N0YXRpYyB2b2lkIGZpbmRDb250 cm9sbGVyRmFpbGVkVG9GaW5kVGV4dENhbGxiYWNrKEJyb3dzZXJTZWFyY2hCYXIgKnNlYXJjaEJh cikKK3sKKyAgICBzZXRFbnRyeUJhY2tncm91bmRDb2xvcihzZWFyY2hCYXIsIFRSVUUpOworfQor CitzdGF0aWMgdm9pZCBmaW5kQ29udHJvbGxlckZvdW5kVGV4dENhbGxiYWNrKEJyb3dzZXJTZWFy Y2hCYXIgKnNlYXJjaEJhcikKK3sKKyAgICBzZXRFbnRyeUJhY2tncm91bmRDb2xvcihzZWFyY2hC YXIsIEZBTFNFKTsKK30KKwogc3RhdGljIHZvaWQgYnJvd3Nlcl9zZWFyY2hfYmFyX2luaXQoQnJv d3NlclNlYXJjaEJhciAqc2VhcmNoQmFyKQogewogICAgIGd0a193aWRnZXRfc2V0X2hleHBhbmQo R1RLX1dJREdFVChzZWFyY2hCYXIpLCBUUlVFKTsKQEAgLTE0MCw2ICsxNjEsMTMgQEAgc3RhdGlj IHZvaWQgYnJvd3Nlcl9zZWFyY2hfYmFyX2luaXQoQnJvd3NlclNlYXJjaEJhciAqc2VhcmNoQmFy KQogICAgIGd0a19lbnRyeV9zZXRfaWNvbl9mcm9tX3N0b2NrKEdUS19FTlRSWShzZWFyY2hCYXIt PmVudHJ5KSwgR1RLX0VOVFJZX0lDT05fUFJJTUFSWSwgR1RLX1NUT0NLX0ZJTkQpOwogICAgIGd0 a19ib3hfcGFja19zdGFydChoQm94LCBzZWFyY2hCYXItPmVudHJ5LCBUUlVFLCBUUlVFLCAwKTsK IAorICAgIHNlYXJjaEJhci0+Y3NzUHJvdmlkZXIgPSBndGtfY3NzX3Byb3ZpZGVyX25ldygpOwor ICAgIGd0a19zdHlsZV9jb250ZXh0X2FkZF9wcm92aWRlcihndGtfd2lkZ2V0X2dldF9zdHlsZV9j b250ZXh0KHNlYXJjaEJhci0+ZW50cnkpLCBHVEtfU1RZTEVfUFJPVklERVIoc2VhcmNoQmFyLT5j c3NQcm92aWRlciksIEdUS19TVFlMRV9QUk9WSURFUl9QUklPUklUWV9BUFBMSUNBVElPTik7CisK KyAgICBzZWFyY2hCYXItPmZhaWxTdHlsZSA9ICIgR3RrRW50cnkjc2VhcmNoRW50cnkge1xuIgor ICAgICAgICAiICAgYmFja2dyb3VuZC1jb2xvcjogI2ZmNjY2NjtcbiIKKyAgICAgICAgIn1cbiI7 CisKICAgICBHdGtCb3ggKmhCb3hCdXR0b25zID0gR1RLX0JPWChndGtfYm94X25ldyhHVEtfT1JJ RU5UQVRJT05fSE9SSVpPTlRBTCwgMCkpOwogICAgIGd0a19ib3hfcGFja19zdGFydChoQm94LCBH VEtfV0lER0VUKGhCb3hCdXR0b25zKSwgVFJVRSwgVFJVRSwgMCk7CiAKQEAgLTIwMiw2ICsyMzAs MTEgQEAgc3RhdGljIHZvaWQgYnJvd3NlclNlYXJjaEJhckZpbmFsaXplKEdPYmplY3QgKmdPYmpl Y3QpCiAgICAgICAgIHNlYXJjaEJhci0+d2ViVmlldyA9IE5VTEw7CiAgICAgfQogCisgICAgaWYg KHNlYXJjaEJhci0+Y3NzUHJvdmlkZXIpIHsKKyAgICAgICAgZ19vYmplY3RfdW5yZWYoc2VhcmNo QmFyLT5jc3NQcm92aWRlcik7CisgICAgICAgIHNlYXJjaEJhci0+Y3NzUHJvdmlkZXIgPSBOVUxM OworICAgIH0KKwogICAgIGlmIChzZWFyY2hCYXItPm9wdGlvbnNNZW51KSB7CiAgICAgICAgIGdf b2JqZWN0X3VucmVmKHNlYXJjaEJhci0+b3B0aW9uc01lbnUpOwogICAgICAgICBzZWFyY2hCYXIt Pm9wdGlvbnNNZW51ID0gTlVMTDsKQEAgLTIyNCw2ICsyNTcsMTAgQEAgR3RrV2lkZ2V0ICpicm93 c2VyX3NlYXJjaF9iYXJfbmV3KFdlYktpdFdlYlZpZXcgKndlYlZpZXcpCiAgICAgR3RrV2lkZ2V0 ICpzZWFyY2hCYXIgPSBHVEtfV0lER0VUKGdfb2JqZWN0X25ldyhCUk9XU0VSX1RZUEVfU0VBUkNI X0JBUiwgTlVMTCkpOwogICAgIEJST1dTRVJfU0VBUkNIX0JBUihzZWFyY2hCYXIpLT53ZWJWaWV3 ID0gZ19vYmplY3RfcmVmKHdlYlZpZXcpOwogCisgICAgV2ViS2l0RmluZENvbnRyb2xsZXIgKmNv bnRyb2xsZXIgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2ZpbmRfY29udHJvbGxlcih3ZWJWaWV3KTsK KyAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQoY29udHJvbGxlciwgImZhaWxlZC10by1maW5k LXRleHQiLCBHX0NBTExCQUNLKGZpbmRDb250cm9sbGVyRmFpbGVkVG9GaW5kVGV4dENhbGxiYWNr KSwgc2VhcmNoQmFyKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQoY29udHJvbGxlciwg ImZvdW5kLXRleHQiLCBHX0NBTExCQUNLKGZpbmRDb250cm9sbGVyRm91bmRUZXh0Q2FsbGJhY2sp LCBzZWFyY2hCYXIpOworCiAgICAgcmV0dXJuIHNlYXJjaEJhcjsKIH0KIAo= 217799 2013-11-25 05:54:54 -0800 2013-11-25 10:36:40 -0800 Patch bug-122681-20131125155444.patch text/plain 5336 agomez U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NzQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGNjYzhiNjQ5ZjE4N2YzMTNlN2I0OWQ0YzE3NjM4OTQ0 Zjg2NWIwZC4uN2VlYzJhMjM3OGFhOGY1ODZlMjhkZDE4ODRhODllZmNhOTE0ZGM4NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDEzLTExLTI1ICBBbmRyZXMgR29tZXogIDxhZ29tZXpAaWdhbGlhLmNvbT4KKworICAg ICAgICBbR1RLXSBTZWFyY2ggZnVuY3Rpb25hbGl0eSBpbiBNaW5pQnJvd3NlciBwcm92aWRlcyBm ZWVkYmFjayBvbiBzZWFyY2ggZmFpbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIyNjgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2hlbiB1c2luZyB0aGUgc2VhcmNoIGZ1bmN0aW9uYWxpdHkgaW4gTWlu aUJyb3dzZXIsIGlmIHRoZSBzZWFyY2gKKyAgICAgICAgZmFpbHMsIHRoZSBlbnRyeSBiYWNrZ3Jv dW5kIGNvbG9yIGdldHMgcmVkIHRvIHJlcG9ydCB0aGUgdXNlcgorICAgICAgICBhYm91dCB0aGUg ZmFpbGluZyBjb25kaXRpb24uIFdoZW4gdGhlIGVudHJ5IGlzIGNsZWFuZWQgb3IgdGhlCisgICAg ICAgIHNlYXJjaCBpcyBhZ2FpbiBzdWNjZXNmdWwgdGhlIGJhY2tncm91bmQgdHVybnMgYmFjayB0 byBpdHMKKyAgICAgICAgb3JpZ2luYWwgY29sb3IuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9n dGsvQnJvd3NlclNlYXJjaEJhci5jOgorICAgICAgICAoc2V0RmFpbGVkU3R5bGVGb3JFbnRyeSk6 IEFkZGVkLgorICAgICAgICAoZG9TZWFyY2gpOiBTZXRzIHRoZSBlbnRyeSdzIGJhY2tncm91bmQg dG8gaXRzIG9yaWdpbmFsIHN0eWxlIGlmCisgICAgICAgIHRoZXJlIGlzIG5vIHRleHQgdG8gc2Vh cmNoLgorICAgICAgICAoZmluZENvbnRyb2xsZXJGYWlsZWRUb0ZpbmRUZXh0Q2FsbGJhY2spOiBB ZGRlZC4KKyAgICAgICAgKGZpbmRDb250cm9sbGVyRm91bmRUZXh0Q2FsbGJhY2spOiBBZGRlZC4K KyAgICAgICAgKGJyb3dzZXJfc2VhcmNoX2Jhcl9pbml0KTogQ3JlYXRlcyBhbmQgYWRkcyBhIG5l dyBDU1MgcHJvdmlkZXIgdG8KKyAgICAgICAgdGhlIHRleHQgZW50cnkgc28gd2UgY2FuIGNoYW5n ZSBpdHMgc3R5bGUgYmFzZWQgb24gdGhlIHN1Y2Nlc3MKKyAgICAgICAgY29uZGl0aW9uIG9mIHRo ZSBzZWFyY2guIEFsc28sIHNldHMgdGhlIHN0eWxlIGZvciB0aGUgZmFpbGluZworICAgICAgICBj YXNlLgorICAgICAgICAoYnJvd3NlclNlYXJjaEJhckZpbmFsaXplKTogRnJlZXMgdGhlIG5ldyBD U1MgcHJvdmlkZXIuCisgICAgICAgIChicm93c2VyX3NlYXJjaF9iYXJfbmV3KTogQ29ubmVjdHMg dGhlIHR3byBuZXcgaGFuZGxlcnMgdG8gdGhlCisgICAgICAgICJmYWlsZWQtdG8tZmluZC10ZXh0 IiBhbmQgImZvdW5kLXRleHQiIHNpZ25hbHMgZW1pdHRlZCBieSB0aGUKKyAgICAgICAgV2ViS2l0 RmluZENvbnRyb2xsZXIuCisKIDIwMTMtMTEtMjIgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUu Y29tPgogCiAgICAgICAgIFNwZWN1bGF0aXZlIE1vdW50YWluIExpb24gYnVpbGQgZml4LgpkaWZm IC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJTZWFyY2hCYXIuYyBiL1Rvb2xz L01pbmlCcm93c2VyL2d0ay9Ccm93c2VyU2VhcmNoQmFyLmMKaW5kZXggZTMzZTRjNWQwN2ZhODU1 OGM5YjFhOGNhMDJhOWRmNjgxOGVmYTEzOS4uOGE0ODIzZjcyNWMxYzZkODkwODNhMjhhNjkzMTNh MjY0OTJkZGE4OCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJTZWFy Y2hCYXIuYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlclNlYXJjaEJhci5jCkBA IC0zMSw2ICszMSw4IEBAIHN0cnVjdCBfQnJvd3NlclNlYXJjaEJhciB7CiAKICAgICBXZWJLaXRX ZWJWaWV3ICp3ZWJWaWV3OwogICAgIEd0a1dpZGdldCAqZW50cnk7CisgICAgR3RrQ3NzUHJvdmlk ZXIgKmNzc1Byb3ZpZGVyOworICAgIGNvbnN0IGdjaGFyKiBmYWlsU3R5bGU7CiAgICAgR3RrV2lk Z2V0ICpwcmV2QnV0dG9uOwogICAgIEd0a1dpZGdldCAqbmV4dEJ1dHRvbjsKICAgICBHdGtXaWRn ZXQgKm9wdGlvbnNNZW51OwpAQCAtNDEsNiArNDMsMTQgQEAgc3RydWN0IF9Ccm93c2VyU2VhcmNo QmFyIHsKIAogR19ERUZJTkVfVFlQRShCcm93c2VyU2VhcmNoQmFyLCBicm93c2VyX3NlYXJjaF9i YXIsIEdUS19UWVBFX1RPT0xCQVIpCiAKK3N0YXRpYyB2b2lkIHNldEZhaWxlZFN0eWxlRm9yRW50 cnkoQnJvd3NlclNlYXJjaEJhciAqc2VhcmNoQmFyLCBnYm9vbGVhbiBmYWlsZWRTZWFyY2gpCit7 CisgICAgaWYgKGZhaWxlZFNlYXJjaCkKKyAgICAgICAgZ3RrX2Nzc19wcm92aWRlcl9sb2FkX2Zy b21fZGF0YShzZWFyY2hCYXItPmNzc1Byb3ZpZGVyLCBzZWFyY2hCYXItPmZhaWxTdHlsZSwgLTEs IE5VTEwpOworICAgIGVsc2UKKyAgICAgICAgZ3RrX2Nzc19wcm92aWRlcl9sb2FkX2Zyb21fZGF0 YShzZWFyY2hCYXItPmNzc1Byb3ZpZGVyLCAiIiwgLTEsIE5VTEwpOworfQorCiBzdGF0aWMgdm9p ZCBkb1NlYXJjaChCcm93c2VyU2VhcmNoQmFyICpzZWFyY2hCYXIpCiB7CiAgICAgR3RrRW50cnkg KmVudHJ5ID0gR1RLX0VOVFJZKHNlYXJjaEJhci0+ZW50cnkpOwpAQCAtNDgsNiArNTgsNyBAQCBz dGF0aWMgdm9pZCBkb1NlYXJjaChCcm93c2VyU2VhcmNoQmFyICpzZWFyY2hCYXIpCiAgICAgaWYg KCFndGtfZW50cnlfZ2V0X3RleHRfbGVuZ3RoKGVudHJ5KSkgewogICAgICAgICB3ZWJraXRfZmlu ZF9jb250cm9sbGVyX3NlYXJjaF9maW5pc2god2Via2l0X3dlYl92aWV3X2dldF9maW5kX2NvbnRy b2xsZXIoc2VhcmNoQmFyLT53ZWJWaWV3KSk7CiAgICAgICAgIGd0a19lbnRyeV9zZXRfaWNvbl9m cm9tX3N0b2NrKGVudHJ5LCBHVEtfRU5UUllfSUNPTl9TRUNPTkRBUlksIE5VTEwpOworICAgICAg ICBzZXRGYWlsZWRTdHlsZUZvckVudHJ5KHNlYXJjaEJhciwgRkFMU0UpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCkBAIC0xMjAsNiArMTMxLDE2IEBAIHN0YXRpYyB2b2lkIHNlYXJjaE1lbnVD aGVja0J1dHRvblRvZ2dsZWRDYWxsYmFjayhCcm93c2VyU2VhcmNoQmFyICpzZWFyY2hCYXIpCiAg ICAgZG9TZWFyY2goc2VhcmNoQmFyKTsKIH0KIAorc3RhdGljIHZvaWQgZmluZENvbnRyb2xsZXJG YWlsZWRUb0ZpbmRUZXh0Q2FsbGJhY2soQnJvd3NlclNlYXJjaEJhciAqc2VhcmNoQmFyKQorewor ICAgIHNldEZhaWxlZFN0eWxlRm9yRW50cnkoc2VhcmNoQmFyLCBUUlVFKTsKK30KKworc3RhdGlj IHZvaWQgZmluZENvbnRyb2xsZXJGb3VuZFRleHRDYWxsYmFjayhCcm93c2VyU2VhcmNoQmFyICpz ZWFyY2hCYXIpCit7CisgICAgc2V0RmFpbGVkU3R5bGVGb3JFbnRyeShzZWFyY2hCYXIsIEZBTFNF KTsKK30KKwogc3RhdGljIHZvaWQgYnJvd3Nlcl9zZWFyY2hfYmFyX2luaXQoQnJvd3NlclNlYXJj aEJhciAqc2VhcmNoQmFyKQogewogICAgIGd0a193aWRnZXRfc2V0X2hleHBhbmQoR1RLX1dJREdF VChzZWFyY2hCYXIpLCBUUlVFKTsKQEAgLTE0MCw2ICsxNjEsMTMgQEAgc3RhdGljIHZvaWQgYnJv d3Nlcl9zZWFyY2hfYmFyX2luaXQoQnJvd3NlclNlYXJjaEJhciAqc2VhcmNoQmFyKQogICAgIGd0 a19lbnRyeV9zZXRfaWNvbl9mcm9tX3N0b2NrKEdUS19FTlRSWShzZWFyY2hCYXItPmVudHJ5KSwg R1RLX0VOVFJZX0lDT05fUFJJTUFSWSwgR1RLX1NUT0NLX0ZJTkQpOwogICAgIGd0a19ib3hfcGFj a19zdGFydChoQm94LCBzZWFyY2hCYXItPmVudHJ5LCBUUlVFLCBUUlVFLCAwKTsKIAorICAgIHNl YXJjaEJhci0+Y3NzUHJvdmlkZXIgPSBndGtfY3NzX3Byb3ZpZGVyX25ldygpOworICAgIGd0a19z dHlsZV9jb250ZXh0X2FkZF9wcm92aWRlcihndGtfd2lkZ2V0X2dldF9zdHlsZV9jb250ZXh0KHNl YXJjaEJhci0+ZW50cnkpLCBHVEtfU1RZTEVfUFJPVklERVIoc2VhcmNoQmFyLT5jc3NQcm92aWRl ciksIEdUS19TVFlMRV9QUk9WSURFUl9QUklPUklUWV9BUFBMSUNBVElPTik7CisKKyAgICBzZWFy Y2hCYXItPmZhaWxTdHlsZSA9ICIgR3RrRW50cnkjc2VhcmNoRW50cnkge1xuIgorICAgICAgICAi ICAgYmFja2dyb3VuZC1jb2xvcjogI2ZmNjY2NjtcbiIKKyAgICAgICAgIn1cbiI7CisKICAgICBH dGtCb3ggKmhCb3hCdXR0b25zID0gR1RLX0JPWChndGtfYm94X25ldyhHVEtfT1JJRU5UQVRJT05f SE9SSVpPTlRBTCwgMCkpOwogICAgIGd0a19ib3hfcGFja19zdGFydChoQm94LCBHVEtfV0lER0VU KGhCb3hCdXR0b25zKSwgVFJVRSwgVFJVRSwgMCk7CiAKQEAgLTIwMiw2ICsyMzAsMTEgQEAgc3Rh dGljIHZvaWQgYnJvd3NlclNlYXJjaEJhckZpbmFsaXplKEdPYmplY3QgKmdPYmplY3QpCiAgICAg ICAgIHNlYXJjaEJhci0+d2ViVmlldyA9IE5VTEw7CiAgICAgfQogCisgICAgaWYgKHNlYXJjaEJh ci0+Y3NzUHJvdmlkZXIpIHsKKyAgICAgICAgZ19vYmplY3RfdW5yZWYoc2VhcmNoQmFyLT5jc3NQ cm92aWRlcik7CisgICAgICAgIHNlYXJjaEJhci0+Y3NzUHJvdmlkZXIgPSBOVUxMOworICAgIH0K KwogICAgIGlmIChzZWFyY2hCYXItPm9wdGlvbnNNZW51KSB7CiAgICAgICAgIGdfb2JqZWN0X3Vu cmVmKHNlYXJjaEJhci0+b3B0aW9uc01lbnUpOwogICAgICAgICBzZWFyY2hCYXItPm9wdGlvbnNN ZW51ID0gTlVMTDsKQEAgLTIyNCw2ICsyNTcsMTAgQEAgR3RrV2lkZ2V0ICpicm93c2VyX3NlYXJj aF9iYXJfbmV3KFdlYktpdFdlYlZpZXcgKndlYlZpZXcpCiAgICAgR3RrV2lkZ2V0ICpzZWFyY2hC YXIgPSBHVEtfV0lER0VUKGdfb2JqZWN0X25ldyhCUk9XU0VSX1RZUEVfU0VBUkNIX0JBUiwgTlVM TCkpOwogICAgIEJST1dTRVJfU0VBUkNIX0JBUihzZWFyY2hCYXIpLT53ZWJWaWV3ID0gZ19vYmpl Y3RfcmVmKHdlYlZpZXcpOwogCisgICAgV2ViS2l0RmluZENvbnRyb2xsZXIgKmNvbnRyb2xsZXIg PSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2ZpbmRfY29udHJvbGxlcih3ZWJWaWV3KTsKKyAgICBnX3Np Z25hbF9jb25uZWN0X3N3YXBwZWQoY29udHJvbGxlciwgImZhaWxlZC10by1maW5kLXRleHQiLCBH X0NBTExCQUNLKGZpbmRDb250cm9sbGVyRmFpbGVkVG9GaW5kVGV4dENhbGxiYWNrKSwgc2VhcmNo QmFyKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQoY29udHJvbGxlciwgImZvdW5kLXRl eHQiLCBHX0NBTExCQUNLKGZpbmRDb250cm9sbGVyRm91bmRUZXh0Q2FsbGJhY2spLCBzZWFyY2hC YXIpOworCiAgICAgcmV0dXJuIHNlYXJjaEJhcjsKIH0KIAo= 217817 2013-11-25 10:36:48 -0800 2013-11-25 16:18:32 -0800 Patch bug-122681-20131125203646.patch text/plain 5204 agomez U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NzQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGNjYzhiNjQ5ZjE4N2YzMTNlN2I0OWQ0YzE3NjM4OTQ0 Zjg2NWIwZC4uMzkyYzUyZWU3OTMxNmU0MGM3MjU0OTg3NWVjNGE2YTg3ODU1OTQwMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDEzLTExLTI1ICBBbmRyZXMgR29tZXogIDxhZ29tZXpAaWdhbGlhLmNvbT4KKworICAg ICAgICBbR1RLXSBTZWFyY2ggZnVuY3Rpb25hbGl0eSBpbiBNaW5pQnJvd3NlciBwcm92aWRlcyBm ZWVkYmFjayBvbiBzZWFyY2ggZmFpbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIyNjgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2hlbiB1c2luZyB0aGUgc2VhcmNoIGZ1bmN0aW9uYWxpdHkgaW4gTWlu aUJyb3dzZXIsIGlmIHRoZSBzZWFyY2gKKyAgICAgICAgZmFpbHMsIHRoZSBlbnRyeSBiYWNrZ3Jv dW5kIGNvbG9yIGdldHMgcmVkIHRvIHJlcG9ydCB0aGUgdXNlcgorICAgICAgICBhYm91dCB0aGUg ZmFpbGluZyBjb25kaXRpb24uIFdoZW4gdGhlIGVudHJ5IGlzIGNsZWFuZWQgb3IgdGhlCisgICAg ICAgIHNlYXJjaCBpcyBhZ2FpbiBzdWNjZXNmdWwgdGhlIGJhY2tncm91bmQgdHVybnMgYmFjayB0 byBpdHMKKyAgICAgICAgb3JpZ2luYWwgY29sb3IuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9n dGsvQnJvd3NlclNlYXJjaEJhci5jOgorICAgICAgICAoc2V0RmFpbGVkU3R5bGVGb3JFbnRyeSk6 IEFkZGVkLgorICAgICAgICAoZG9TZWFyY2gpOiBTZXRzIHRoZSBlbnRyeSdzIGJhY2tncm91bmQg dG8gaXRzIG9yaWdpbmFsIHN0eWxlIGlmCisgICAgICAgIHRoZXJlIGlzIG5vIHRleHQgdG8gc2Vh cmNoLgorICAgICAgICAoZmluZENvbnRyb2xsZXJGYWlsZWRUb0ZpbmRUZXh0Q2FsbGJhY2spOiBB ZGRlZC4KKyAgICAgICAgKGZpbmRDb250cm9sbGVyRm91bmRUZXh0Q2FsbGJhY2spOiBBZGRlZC4K KyAgICAgICAgKGJyb3dzZXJfc2VhcmNoX2Jhcl9pbml0KTogQ3JlYXRlcyBhbmQgYWRkcyBhIG5l dyBDU1MgcHJvdmlkZXIgdG8KKyAgICAgICAgdGhlIHRleHQgZW50cnkgc28gd2UgY2FuIGNoYW5n ZSBpdHMgc3R5bGUgYmFzZWQgb24gdGhlIHN1Y2Nlc3MKKyAgICAgICAgY29uZGl0aW9uIG9mIHRo ZSBzZWFyY2guCisgICAgICAgIChicm93c2VyU2VhcmNoQmFyRmluYWxpemUpOiBGcmVlcyB0aGUg bmV3IENTUyBwcm92aWRlci4KKyAgICAgICAgKGJyb3dzZXJfc2VhcmNoX2Jhcl9uZXcpOiBDb25u ZWN0cyB0aGUgdHdvIG5ldyBoYW5kbGVycyB0byB0aGUKKyAgICAgICAgImZhaWxlZC10by1maW5k LXRleHQiIGFuZCAiZm91bmQtdGV4dCIgc2lnbmFscyBlbWl0dGVkIGJ5IHRoZQorICAgICAgICBX ZWJLaXRGaW5kQ29udHJvbGxlci4KKwogMjAxMy0xMS0yMiAgRGVhbiBKYWNrc29uICA8ZGlub0Bh cHBsZS5jb20+CiAKICAgICAgICAgU3BlY3VsYXRpdmUgTW91bnRhaW4gTGlvbiBidWlsZCBmaXgu CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlclNlYXJjaEJhci5jIGIv VG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJTZWFyY2hCYXIuYwppbmRleCBlMzNlNGM1ZDA3 ZmE4NTU4YzliMWE4Y2EwMmE5ZGY2ODE4ZWZhMTM5Li43NTg1YjU2NGQzNjgyZjZkZjhkM2VjZGE0 ZGVhM2IwNDMxOGMwYzQwIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3Nl clNlYXJjaEJhci5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyU2VhcmNoQmFy LmMKQEAgLTI2LDExICsyNiwxNCBAQAogI2luY2x1ZGUgIkJyb3dzZXJTZWFyY2hCYXIuaCIKIAog CitzdGF0aWMgY29uc3QgY2hhciAqc2VhcmNoRW50cnlGYWlsZWRTdHlsZSA9ICJHdGtFbnRyeSNz ZWFyY2hFbnRyeSB7YmFja2dyb3VuZC1jb2xvcjogI2ZmNjY2Njt9IjsKKwogc3RydWN0IF9Ccm93 c2VyU2VhcmNoQmFyIHsKICAgICBHdGtUb29sYmFyIHBhcmVudDsKIAogICAgIFdlYktpdFdlYlZp ZXcgKndlYlZpZXc7CiAgICAgR3RrV2lkZ2V0ICplbnRyeTsKKyAgICBHdGtDc3NQcm92aWRlciAq Y3NzUHJvdmlkZXI7CiAgICAgR3RrV2lkZ2V0ICpwcmV2QnV0dG9uOwogICAgIEd0a1dpZGdldCAq bmV4dEJ1dHRvbjsKICAgICBHdGtXaWRnZXQgKm9wdGlvbnNNZW51OwpAQCAtNDEsNiArNDQsMTEg QEAgc3RydWN0IF9Ccm93c2VyU2VhcmNoQmFyIHsKIAogR19ERUZJTkVfVFlQRShCcm93c2VyU2Vh cmNoQmFyLCBicm93c2VyX3NlYXJjaF9iYXIsIEdUS19UWVBFX1RPT0xCQVIpCiAKK3N0YXRpYyB2 b2lkIHNldEZhaWxlZFN0eWxlRm9yRW50cnkoQnJvd3NlclNlYXJjaEJhciAqc2VhcmNoQmFyLCBn Ym9vbGVhbiBmYWlsZWRTZWFyY2gpCit7CisgICAgZ3RrX2Nzc19wcm92aWRlcl9sb2FkX2Zyb21f ZGF0YShzZWFyY2hCYXItPmNzc1Byb3ZpZGVyLCBmYWlsZWRTZWFyY2ggPyBzZWFyY2hFbnRyeUZh aWxlZFN0eWxlIDogIiIsIC0xLCBOVUxMKTsKK30KKwogc3RhdGljIHZvaWQgZG9TZWFyY2goQnJv d3NlclNlYXJjaEJhciAqc2VhcmNoQmFyKQogewogICAgIEd0a0VudHJ5ICplbnRyeSA9IEdUS19F TlRSWShzZWFyY2hCYXItPmVudHJ5KTsKQEAgLTQ4LDYgKzU2LDcgQEAgc3RhdGljIHZvaWQgZG9T ZWFyY2goQnJvd3NlclNlYXJjaEJhciAqc2VhcmNoQmFyKQogICAgIGlmICghZ3RrX2VudHJ5X2dl dF90ZXh0X2xlbmd0aChlbnRyeSkpIHsKICAgICAgICAgd2Via2l0X2ZpbmRfY29udHJvbGxlcl9z ZWFyY2hfZmluaXNoKHdlYmtpdF93ZWJfdmlld19nZXRfZmluZF9jb250cm9sbGVyKHNlYXJjaEJh ci0+d2ViVmlldykpOwogICAgICAgICBndGtfZW50cnlfc2V0X2ljb25fZnJvbV9zdG9jayhlbnRy eSwgR1RLX0VOVFJZX0lDT05fU0VDT05EQVJZLCBOVUxMKTsKKyAgICAgICAgc2V0RmFpbGVkU3R5 bGVGb3JFbnRyeShzZWFyY2hCYXIsIEZBTFNFKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApA QCAtMTIwLDYgKzEyOSwxNiBAQCBzdGF0aWMgdm9pZCBzZWFyY2hNZW51Q2hlY2tCdXR0b25Ub2dn bGVkQ2FsbGJhY2soQnJvd3NlclNlYXJjaEJhciAqc2VhcmNoQmFyKQogICAgIGRvU2VhcmNoKHNl YXJjaEJhcik7CiB9CiAKK3N0YXRpYyB2b2lkIGZpbmRDb250cm9sbGVyRmFpbGVkVG9GaW5kVGV4 dENhbGxiYWNrKEJyb3dzZXJTZWFyY2hCYXIgKnNlYXJjaEJhcikKK3sKKyAgICBzZXRGYWlsZWRT dHlsZUZvckVudHJ5KHNlYXJjaEJhciwgVFJVRSk7Cit9CisKK3N0YXRpYyB2b2lkIGZpbmRDb250 cm9sbGVyRm91bmRUZXh0Q2FsbGJhY2soQnJvd3NlclNlYXJjaEJhciAqc2VhcmNoQmFyKQorewor ICAgIHNldEZhaWxlZFN0eWxlRm9yRW50cnkoc2VhcmNoQmFyLCBGQUxTRSk7Cit9CisKIHN0YXRp YyB2b2lkIGJyb3dzZXJfc2VhcmNoX2Jhcl9pbml0KEJyb3dzZXJTZWFyY2hCYXIgKnNlYXJjaEJh cikKIHsKICAgICBndGtfd2lkZ2V0X3NldF9oZXhwYW5kKEdUS19XSURHRVQoc2VhcmNoQmFyKSwg VFJVRSk7CkBAIC0xNDAsNiArMTU5LDkgQEAgc3RhdGljIHZvaWQgYnJvd3Nlcl9zZWFyY2hfYmFy X2luaXQoQnJvd3NlclNlYXJjaEJhciAqc2VhcmNoQmFyKQogICAgIGd0a19lbnRyeV9zZXRfaWNv bl9mcm9tX3N0b2NrKEdUS19FTlRSWShzZWFyY2hCYXItPmVudHJ5KSwgR1RLX0VOVFJZX0lDT05f UFJJTUFSWSwgR1RLX1NUT0NLX0ZJTkQpOwogICAgIGd0a19ib3hfcGFja19zdGFydChoQm94LCBz ZWFyY2hCYXItPmVudHJ5LCBUUlVFLCBUUlVFLCAwKTsKIAorICAgIHNlYXJjaEJhci0+Y3NzUHJv dmlkZXIgPSBndGtfY3NzX3Byb3ZpZGVyX25ldygpOworICAgIGd0a19zdHlsZV9jb250ZXh0X2Fk ZF9wcm92aWRlcihndGtfd2lkZ2V0X2dldF9zdHlsZV9jb250ZXh0KHNlYXJjaEJhci0+ZW50cnkp LCBHVEtfU1RZTEVfUFJPVklERVIoc2VhcmNoQmFyLT5jc3NQcm92aWRlciksIEdUS19TVFlMRV9Q Uk9WSURFUl9QUklPUklUWV9BUFBMSUNBVElPTik7CisKICAgICBHdGtCb3ggKmhCb3hCdXR0b25z ID0gR1RLX0JPWChndGtfYm94X25ldyhHVEtfT1JJRU5UQVRJT05fSE9SSVpPTlRBTCwgMCkpOwog ICAgIGd0a19ib3hfcGFja19zdGFydChoQm94LCBHVEtfV0lER0VUKGhCb3hCdXR0b25zKSwgVFJV RSwgVFJVRSwgMCk7CiAKQEAgLTIwMiw2ICsyMjQsMTEgQEAgc3RhdGljIHZvaWQgYnJvd3NlclNl YXJjaEJhckZpbmFsaXplKEdPYmplY3QgKmdPYmplY3QpCiAgICAgICAgIHNlYXJjaEJhci0+d2Vi VmlldyA9IE5VTEw7CiAgICAgfQogCisgICAgaWYgKHNlYXJjaEJhci0+Y3NzUHJvdmlkZXIpIHsK KyAgICAgICAgZ19vYmplY3RfdW5yZWYoc2VhcmNoQmFyLT5jc3NQcm92aWRlcik7CisgICAgICAg IHNlYXJjaEJhci0+Y3NzUHJvdmlkZXIgPSBOVUxMOworICAgIH0KKwogICAgIGlmIChzZWFyY2hC YXItPm9wdGlvbnNNZW51KSB7CiAgICAgICAgIGdfb2JqZWN0X3VucmVmKHNlYXJjaEJhci0+b3B0 aW9uc01lbnUpOwogICAgICAgICBzZWFyY2hCYXItPm9wdGlvbnNNZW51ID0gTlVMTDsKQEAgLTIy NCw2ICsyNTEsMTAgQEAgR3RrV2lkZ2V0ICpicm93c2VyX3NlYXJjaF9iYXJfbmV3KFdlYktpdFdl YlZpZXcgKndlYlZpZXcpCiAgICAgR3RrV2lkZ2V0ICpzZWFyY2hCYXIgPSBHVEtfV0lER0VUKGdf b2JqZWN0X25ldyhCUk9XU0VSX1RZUEVfU0VBUkNIX0JBUiwgTlVMTCkpOwogICAgIEJST1dTRVJf U0VBUkNIX0JBUihzZWFyY2hCYXIpLT53ZWJWaWV3ID0gZ19vYmplY3RfcmVmKHdlYlZpZXcpOwog CisgICAgV2ViS2l0RmluZENvbnRyb2xsZXIgKmNvbnRyb2xsZXIgPSB3ZWJraXRfd2ViX3ZpZXdf Z2V0X2ZpbmRfY29udHJvbGxlcih3ZWJWaWV3KTsKKyAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBw ZWQoY29udHJvbGxlciwgImZhaWxlZC10by1maW5kLXRleHQiLCBHX0NBTExCQUNLKGZpbmRDb250 cm9sbGVyRmFpbGVkVG9GaW5kVGV4dENhbGxiYWNrKSwgc2VhcmNoQmFyKTsKKyAgICBnX3NpZ25h bF9jb25uZWN0X3N3YXBwZWQoY29udHJvbGxlciwgImZvdW5kLXRleHQiLCBHX0NBTExCQUNLKGZp bmRDb250cm9sbGVyRm91bmRUZXh0Q2FsbGJhY2spLCBzZWFyY2hCYXIpOworCiAgICAgcmV0dXJu IHNlYXJjaEJhcjsKIH0KIAo=