38661 2010-05-06 10:40:14 -0700 Persist V8's ScriptData to cache 2010-06-19 17:38:17 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 37874 39948 40196 40838 0 tonyg webkit-unassigned abarth ager commit-queue dglazkov eric levin webkit.review.bot oldest_to_newest 221798 0 tonyg 2010-05-06 10:40:14 -0700 V8 exposes ScriprtData which represents the work done in pre-compiling JavaScript. It should be persisted to cache to speed up future compilations of the same script. 221801 1 55260 tonyg 2010-05-06 10:42:22 -0700 Created attachment 55260 Demonstrate caching ScriptData This isn't ready for review yet, but helps provide context for https://bugs.webkit.org/show_bug.cgi?id=37874 231427 2 57269 tonyg 2010-05-27 13:10:43 -0700 Created attachment 57269 Patch 231436 3 webkit.review.bot 2010-05-27 13:28:36 -0700 Attachment 57269 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/2540060 231442 4 tonyg 2010-05-27 13:33:50 -0700 The build breakage indicates that the V8 roll hasn't taken place on the builder yet. That roll was landed this morning in: http://src.chromium.org/viewvc/chrome?view=rev&revision=48370 Should just be a matter of time before it updates, this should still be ready for review. 231492 5 57269 abarth 2010-05-27 15:55:46 -0700 Comment on attachment 57269 Patch This looks good. I'm sad about the magic number, as we've discussed before. Also, you're comments aren't they way we usually do things in WebKit-land. Maybe worth tweaking slightly before landing? WebCore/ChangeLog:12 + Chromium's morejs benchmark shows a 3-4% improvement on fast hardware. Awesome. WebCore/bindings/v8/V8Proxy.cpp:345 + static const unsigned dataTypeID = 0xECC13BD7; :( WebCore/bindings/v8/V8Proxy.cpp:353 + // If there is cached data, use it. We usually don't comment about *what* the code is doing, but more *why* it's doing that. WebCore/bindings/v8/V8Proxy.cpp:359 + v8::ScriptData* scriptData = v8::ScriptData::PreCompile(sourceCode.source().utf8().data(), sourceCode.source().utf8().length()); Is the conversion to utf8 expensive? Maybe we should do that once instead of twice? 231807 6 tonyg 2010-05-28 11:18:11 -0700 (In reply to comment #5) > (From update of attachment 57269 [details]) > This looks good. I'm sad about the magic number, as we've discussed before. As far as I can tell it is either (1) magic number or (2) enum that lives in WebCore with value names that represent things outside of WebCore. Initially you didn't like such an enum, but if you think it beats the magic number approach, I'm happy to switch back to that. Also, you're comments aren't they way we usually do things in WebKit-land. Thanks. I've gone back to some more spartan comments that only explain "why". Let me know if they need more tweaking. Maybe worth tweaking slightly before landing? > > WebCore/ChangeLog:12 > + Chromium's morejs benchmark shows a 3-4% improvement on fast hardware. > Awesome. It appears even faster now without that silly double UTF8 encoding. I'm anxious to see what it looks like on the bots. > > WebCore/bindings/v8/V8Proxy.cpp:345 > + static const unsigned dataTypeID = 0xECC13BD7; > :( > > WebCore/bindings/v8/V8Proxy.cpp:353 > + // If there is cached data, use it. > We usually don't comment about *what* the code is doing, but more *why* it's doing that. > > WebCore/bindings/v8/V8Proxy.cpp:359 > + v8::ScriptData* scriptData = v8::ScriptData::PreCompile(sourceCode.source().utf8().data(), sourceCode.source().utf8().length()); > Is the conversion to utf8 expensive? Maybe we should do that once instead of twice? Good catch. That was dumb. Mads, it really seems like it would be an improvement here if I could pass the v8 external string that is already available in evaluate() instead of having to convert to utf8 here. Initially you didn't want me to modify PreCompile() to take a handle to a v8 string. Another approach would be to add an overloaded PreCompile() that takes a v8 string. What do you think? I wouldn't have to block this patch on that, but could just switch to it after it lands. 231808 7 57348 tonyg 2010-05-28 11:19:56 -0700 Created attachment 57348 Patch 231867 8 webkit.review.bot 2010-05-28 12:26:54 -0700 Attachment 57348 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/2597048 233074 9 57348 abarth 2010-06-01 22:17:47 -0700 Comment on attachment 57348 Patch Ok. This looks like a good starting point. We can iterate from here if we get some good ideas about how to deal with external strings, etc. 233311 10 57664 tonyg 2010-06-02 10:08:07 -0700 Created attachment 57664 Same patch triggering chromium EWS bot run 233331 11 webkit.review.bot 2010-06-02 10:54:34 -0700 Attachment 57664 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/2777101 233333 12 tonyg 2010-06-02 10:59:49 -0700 I'm confused as to what controls the V8 dependency version on the EWS bot. The required version of V8 rolled into chromium over a week ago. Is there a separate process to roll V8 into WebKit? 233335 13 dglazkov 2010-06-02 11:03:31 -0700 (In reply to comment #12) > I'm confused as to what controls the V8 dependency version on the EWS bot. The required version of V8 rolled into chromium over a week ago. Is there a separate process to roll V8 into WebKit? Yep. WebKit/chromium/DEPS. 233343 14 tonyg 2010-06-02 11:13:20 -0700 (In reply to comment #13) > (In reply to comment #12) > > I'm confused as to what controls the V8 dependency version on the EWS bot. The required version of V8 rolled into chromium over a week ago. Is there a separate process to roll V8 into WebKit? > > Yep. WebKit/chromium/DEPS. Thanks! It looks like tkent tried to do a roll yesterday but had to roll back. I'll just wait for that to occur. 233345 15 dglazkov 2010-06-02 11:14:48 -0700 (In reply to comment #14) > (In reply to comment #13) > > (In reply to comment #12) > > > I'm confused as to what controls the V8 dependency version on the EWS bot. The required version of V8 rolled into chromium over a week ago. Is there a separate process to roll V8 into WebKit? > > > > Yep. WebKit/chromium/DEPS. > > Thanks! It looks like tkent tried to do a roll yesterday but had to roll back. I'll just wait for that to occur. Well, technically I'll have to do that, because I'll need to clean up some stuff on bots. Maybe we'll do it together? :) 233346 16 tonyg 2010-06-02 11:15:59 -0700 (In reply to comment #15) > (In reply to comment #14) > > (In reply to comment #13) > > > (In reply to comment #12) > > > > I'm confused as to what controls the V8 dependency version on the EWS bot. The required version of V8 rolled into chromium over a week ago. Is there a separate process to roll V8 into WebKit? > > > > > > Yep. WebKit/chromium/DEPS. > > > > Thanks! It looks like tkent tried to do a roll yesterday but had to roll back. I'll just wait for that to occur. > > Well, technically I'll have to do that, because I'll need to clean up some stuff on bots. Maybe we'll do it together? :) I'd love to learn and help. 233389 17 57664 abarth 2010-06-02 12:35:59 -0700 Comment on attachment 57664 Same patch triggering chromium EWS bot run Hum... Not sure you got the bot run you wanted, but this patch still LGTM. 233853 18 57795 tonyg 2010-06-03 11:32:10 -0700 Created attachment 57795 Identical patch. r60622 has the DEP roll this needed, trigger another EWS run to verify. 234245 19 57795 abarth 2010-06-04 09:30:26 -0700 Comment on attachment 57795 Identical patch. r60622 has the DEP roll this needed, trigger another EWS run to verify. yay for green bubbles 234257 20 57795 commit-queue 2010-06-04 09:59:33 -0700 Comment on attachment 57795 Identical patch. r60622 has the DEP roll this needed, trigger another EWS run to verify. Clearing flags on attachment: 57795 Committed r60684: <http://trac.webkit.org/changeset/60684> 234258 21 commit-queue 2010-06-04 09:59:40 -0700 All reviewed patches have been landed. Closing bug. 237998 22 tonyg 2010-06-14 13:00:48 -0700 Reopening this as it had to be rolled back because it broke the chromium reliability tests. The page at http://www.mbaobao.com/ for instance cased a reliable crash. I'm uploading a new fixed patch shortly. 238016 23 58694 tonyg 2010-06-14 13:30:05 -0700 Created attachment 58694 Patch 238018 24 tonyg 2010-06-14 13:32:48 -0700 (In reply to comment #23) > Created an attachment (id=58694) [details] > Patch This patch has two differences from the original that had to be rolled back: 1. It includes a LayoutTest that fails with the original patch, but passes now. 2. It doesn't call .utf8() on the source string, but instead uses the same external V8 string that is passed to compile(). 238019 25 webkit.review.bot 2010-06-14 13:33:15 -0700 Attachment 58694 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/bindings/v8/V8Proxy.h:56: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 238021 26 tonyg 2010-06-14 13:41:22 -0700 (In reply to comment #25) > Attachment 58694 [details] did not pass style-queue: > > Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 > WebCore/bindings/v8/V8Proxy.h:56: Code inside a namespace should not be indented. [whitespace/indent] [4] > Total errors found: 1 in 8 files > > > If any of these errors are false positives, please file a bug against check-webkit-style. This has happened to me a couple of other times. If the rest of the class has improper indentation then check-webkit-style complains about a new addition that follows the current style of the class. For future reference, I'm wondering if it is acceptable to submit a separate patch that fixes the indentation error for a whole class or if that messes with revision history too much. Alternatively, would it be possible to modify check-webkit-style to not complain in this case if the rest of the class is indented improperly? 238253 27 levin 2010-06-14 23:34:13 -0700 (In reply to comment #26) > This has happened to me a couple of other times. If the rest of the class has improper indentation then check-webkit-style complains about a new addition that follows the current style of the class. True. > For future reference, I'm wondering if it is acceptable to submit a separate patch that fixes the indentation error for a whole class or if that messes with revision history too much. Sounds fine to me. > Alternatively, would it be possible to modify check-webkit-style to not complain in this case if the rest of the class is indented improperly? We did one fix in this direction. It only complains if the first line in the namespace is indented improperly so this doesn't fire too often but it still does go off at time like this. Sorry. 238256 28 58694 levin 2010-06-14 23:43:25 -0700 Comment on attachment 58694 Patch A few minor things that would be nice to clean up. WebCore/ChangeLog:13 + originally submitted (before it had to be rolled back. You're missing a closing ) here. WebCore/bindings/v8/V8Proxy.cpp:34 + #include "CachedMetadata.h" This header is out of order. (case sensitive sorting and 'a' > 'S'). WebCore/bindings/v8/V8Proxy.cpp:358 + v8::ScriptData* scriptData = v8::ScriptData::PreCompile(code); imo, ideally this would be an OwnPtr<> even though it is returned in two lines. (Code tends to grow over time and then people add early returns without realizing that there is something to be cleaned up.) WebCore/bindings/v8/V8Proxy.h:289 + static v8::Handle<v8::Script> compileScript(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* scriptData = 0); The param name "scriptData" shouldn't be here. 238503 29 tonyg 2010-06-15 12:39:32 -0700 (In reply to comment #28) > (From update of attachment 58694 [details]) > A few minor things that would be nice to clean up. > > WebCore/ChangeLog:13 > + originally submitted (before it had to be rolled back. > You're missing a closing ) here. Thanks. Fixed. > > WebCore/bindings/v8/V8Proxy.cpp:34 > + #include "CachedMetadata.h" > This header is out of order. (case sensitive sorting and 'a' > 'S'). > Sneaky. Good catch. Fixed. > > WebCore/bindings/v8/V8Proxy.cpp:358 > + v8::ScriptData* scriptData = v8::ScriptData::PreCompile(code); > imo, ideally this would be an OwnPtr<> even though it is returned in two lines. (Code tends to grow over time and then people add early returns without realizing that there is something to be cleaned up.) > Done. > WebCore/bindings/v8/V8Proxy.h:289 > + static v8::Handle<v8::Script> compileScript(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* scriptData = 0); > The param name "scriptData" shouldn't be here. Done. 238509 30 58809 tonyg 2010-06-15 12:53:57 -0700 Created attachment 58809 Patch 238511 31 webkit.review.bot 2010-06-15 12:56:26 -0700 Attachment 58809 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/bindings/v8/V8Proxy.h:56: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 239916 32 58809 commit-queue 2010-06-18 08:00:39 -0700 Comment on attachment 58809 Patch Clearing flags on attachment: 58809 Committed r61405: <http://trac.webkit.org/changeset/61405> 239917 33 commit-queue 2010-06-18 08:00:46 -0700 All reviewed patches have been landed. Closing bug. 239925 34 webkit.review.bot 2010-06-18 08:22:13 -0700 http://trac.webkit.org/changeset/61405 might have broken SnowLeopard Intel Release (Tests) 239969 35 59121 tonyg 2010-06-18 09:21:52 -0700 Created attachment 59121 Change minPreparseLength from unsigned to int to fix mac compile 239974 36 webkit.review.bot 2010-06-18 09:23:06 -0700 Attachment 59121 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/bindings/v8/V8Proxy.h:56: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 239976 37 tonyg 2010-06-18 09:23:36 -0700 This broke the chromium mac compile due to this warning (warnings treated as errors): /Users/cltbld/Desktop/BuildSlaveData/WebKit-BuildSlave/chromium-mac-release/build/WebCore/WebCore.gyp/../bindings/v8/V8Proxy.cpp:351: warning: comparison between signed and unsigned integer expressions This latest patch corrects that. 240390 38 59121 abarth 2010-06-19 17:03:03 -0700 Comment on attachment 59121 Change minPreparseLength from unsigned to int to fix mac compile ok. I wish we had interdiffs so I could see what you changed, but this look correct. 240392 39 tonyg 2010-06-19 17:10:54 -0700 (In reply to comment #38) > (From update of attachment 59121 [details]) > ok. I wish we had interdiffs so I could see what you changed, but this look correct. Old: static const unsigned minPreparseLength = 1024; New: static const int minPreparseLength = 1024; 240394 40 abarth 2010-06-19 17:14:41 -0700 I see. Yeah, I'm not very good at spotting signed / unsigned comparison mismatches. 240406 41 59121 commit-queue 2010-06-19 17:38:10 -0700 Comment on attachment 59121 Change minPreparseLength from unsigned to int to fix mac compile Clearing flags on attachment: 59121 Committed r61499: <http://trac.webkit.org/changeset/61499> 240407 42 commit-queue 2010-06-19 17:38:17 -0700 All reviewed patches have been landed. Closing bug. 55260 2010-05-06 10:42:22 -0700 2010-05-27 13:10:38 -0700 Demonstrate caching ScriptData v8.patch text/plain 7019 tonyg SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1ODg5NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTAtMDUtMDYgIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTdG9yZSBWOCdzIFNjcmlwdERhdGEgYXMgQ2FjaGVkTWV0YWRhdGEuIFRoaXMgaXNuJ3QgcmVh ZHkgdG8gc3VibWl0CisgICAgICAgIHlldCBhcyBWOCdzIFNjcmlwdERhdGEgQVBJIHNob3VsZCBw cm9iYWJseSBiZSBtb2RpZmllZCBmaXJzdC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVz ZSBubyBuZXcgZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L1NjcmlwdFNv dXJjZUNvZGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdFNvdXJjZUNvZGU6OlNjcmlwdFNv dXJjZUNvZGUpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0U291cmNlQ29kZTo6Y2FjaGVkU2Ny aXB0KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFByb3h5LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlY4UHJveHk6OmNvbXBpbGVTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6VjhQcm94eTo6 cHJlY29tcGlsZVNjcmlwdCk6CisgICAgICAgIChXZWJDb3JlOjpWOFByb3h5OjpldmFsdWF0ZSk6 CisgICAgICAgICogYmluZGluZ3MvdjgvVjhQcm94eS5oOgorCiAyMDEwLTA1LTA2ICBEYXJpbiBB ZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBCZXRoIERha2lu LgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTb3VyY2VDb2RlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTb3VyY2VDb2RlLmgJKHJldmlzaW9uIDU4 ODU1KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTb3VyY2VDb2RlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTMxLDYgKzMxLDcgQEAKICNpZm5kZWYgU2NyaXB0U291cmNlQ29kZV9oCiAjZGVm aW5lIFNjcmlwdFNvdXJjZUNvZGVfaAogCisjaW5jbHVkZSAiQ2FjaGVkUmVzb3VyY2VIYW5kbGUu aCIKICNpbmNsdWRlICJDYWNoZWRTY3JpcHQuaCIKICNpbmNsdWRlICJLVVJMLmgiCiAjaW5jbHVk ZSAiUGxhdGZvcm1TdHJpbmcuaCIKQEAgLTQxLDYgKzQyLDcgQEAgY2xhc3MgU2NyaXB0U291cmNl Q29kZSB7CiBwdWJsaWM6CiAgICAgU2NyaXB0U291cmNlQ29kZShjb25zdCBTdHJpbmcmIHNvdXJj ZSwgY29uc3QgS1VSTCYgdXJsID0gS1VSTCgpLCBpbnQgc3RhcnRMaW5lID0gMSkKICAgICAgICAg OiBtX3NvdXJjZShzb3VyY2UpCisgICAgICAgICwgbV9jYWNoZWRTY3JpcHQoMCkKICAgICAgICAg LCBtX3VybCh1cmwpCiAgICAgICAgICwgbV9zdGFydExpbmUoc3RhcnRMaW5lKQogICAgIHsKQEAg LTUwLDYgKzUyLDcgQEAgcHVibGljOgogICAgIC8vIE5vdCBzdXJlIGlmIHRoYXQgbWF0dGVycy4K ICAgICBTY3JpcHRTb3VyY2VDb2RlKENhY2hlZFNjcmlwdCogY3MpCiAgICAgICAgIDogbV9zb3Vy Y2UoY3MtPnNjcmlwdCgpKQorICAgICAgICAsIG1fY2FjaGVkU2NyaXB0KGNzKQogICAgICAgICAs IG1fdXJsKFBhcnNlZFVSTFN0cmluZywgY3MtPnVybCgpKQogICAgICAgICAsIG1fc3RhcnRMaW5l KDEpCiAgICAgewpAQCAtNTgsMTEgKzYxLDEzIEBAIHB1YmxpYzoKICAgICBib29sIGlzRW1wdHko KSBjb25zdCB7IHJldHVybiBtX3NvdXJjZS5pc0VtcHR5KCk7IH0KIAogICAgIGNvbnN0IFN0cmlu ZyYgc291cmNlKCkgY29uc3QgeyByZXR1cm4gbV9zb3VyY2U7IH0KKyAgICBDYWNoZWRTY3JpcHQq IGNhY2hlZFNjcmlwdCgpIGNvbnN0IHsgcmV0dXJuIG1fY2FjaGVkU2NyaXB0LmdldCgpOyB9CiAg ICAgY29uc3QgS1VSTCYgdXJsKCkgY29uc3QgeyByZXR1cm4gbV91cmw7IH0KICAgICBpbnQgc3Rh cnRMaW5lKCkgY29uc3QgeyByZXR1cm4gbV9zdGFydExpbmU7IH0KIAogcHJpdmF0ZToKICAgICBT dHJpbmcgbV9zb3VyY2U7CisgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkU2NyaXB0PiBt X2NhY2hlZFNjcmlwdDsKICAgICBLVVJMIG1fdXJsOwogICAgIGludCBtX3N0YXJ0TGluZTsKIH07 CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAJKHJldmlzaW9uIDU4ODU1KQorKysgV2ViQ29y ZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBA QAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlY4UHJveHkuaCIKIAorI2luY2x1ZGUg IkNhY2hlZE1ldGFkYXRhLmgiCiAjaW5jbHVkZSAiQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24u aCIKICNpbmNsdWRlICJEYXRlRXh0ZW5zaW9uLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRMb2FkZXIu aCIKQEAgLTcwLDYgKzcxLDcgQEAKICNpbmNsdWRlIDx2OC5oPgogI2luY2x1ZGUgPHd0Zi9Bc3Nl cnRpb25zLmg+CiAjaW5jbHVkZSA8d3RmL093bkFycmF5UHRyLmg+CisjaW5jbHVkZSA8d3RmL093 blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvU3Ry aW5nRXh0cmFzLmg+CiAjaW5jbHVkZSA8d3RmL1VudXNlZFBhcmFtLmg+CkBAIC0yMzMsMTMgKzIz NSwxMyBAQCBWOFByb3h5Ojp+VjhQcm94eSgpCiAgICAgd2luZG93U2hlbGwoKS0+ZGVzdHJveUds b2JhbCgpOwogfQogCi12ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IFY4UHJveHk6OmNvbXBpbGVTY3Jp cHQodjg6OkhhbmRsZTx2ODo6U3RyaW5nPiBjb2RlLCBjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBp bnQgYmFzZUxpbmUpCit2ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IFY4UHJveHk6OmNvbXBpbGVTY3Jp cHQodjg6OkhhbmRsZTx2ODo6U3RyaW5nPiBjb2RlLCBjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBp bnQgYmFzZUxpbmUsIHY4OjpTY3JpcHREYXRhKiBzY3JpcHREYXRhKQogewogICAgIGNvbnN0IHVp bnQxNl90KiBmaWxlTmFtZVN0cmluZyA9IGZyb21XZWJDb3JlU3RyaW5nKGZpbGVOYW1lKTsKICAg ICB2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IG5hbWUgPSB2ODo6U3RyaW5nOjpOZXcoZmlsZU5hbWVT dHJpbmcsIGZpbGVOYW1lLmxlbmd0aCgpKTsKICAgICB2ODo6SGFuZGxlPHY4OjpJbnRlZ2VyPiBs aW5lID0gdjg6OkludGVnZXI6Ok5ldyhiYXNlTGluZSk7CiAgICAgdjg6OlNjcmlwdE9yaWdpbiBv cmlnaW4obmFtZSwgbGluZSk7Ci0gICAgdjg6OkhhbmRsZTx2ODo6U2NyaXB0PiBzY3JpcHQgPSB2 ODo6U2NyaXB0OjpDb21waWxlKGNvZGUsICZvcmlnaW4pOworICAgIHY4OjpIYW5kbGU8djg6OlNj cmlwdD4gc2NyaXB0ID0gdjg6OlNjcmlwdDo6Q29tcGlsZShjb2RlLCAmb3JpZ2luLCBzY3JpcHRE YXRhKTsKICAgICByZXR1cm4gc2NyaXB0OwogfQogCkBAIC0zMzgsNiArMzQwLDM3IEBAIGJvb2wg VjhQcm94eTo6c2V0SW5qZWN0ZWRTY3JpcHRDb250ZXh0RGUKICAgICByZXR1cm4gdHJ1ZTsKIH0K IAorUGFzc093blB0cjx2ODo6U2NyaXB0RGF0YT4gVjhQcm94eTo6cHJlY29tcGlsZVNjcmlwdChj b25zdCBTY3JpcHRTb3VyY2VDb2RlJiBzb3VyY2VDb2RlKQoreworICAgIHN0YXRpYyBjb25zdCBp bnQgY2hhclRvVW5zaWduZWRGYWN0b3IgPSBzaXplb2YodW5zaWduZWQpIC8gc2l6ZW9mKGNoYXIp OworICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBkYXRhVHlwZUlEID0gMHhFQ0MxM0JENzsKKwor ICAgIC8vIElmIHRoZXJlIGlzIG5vIENhY2hlZFNjcmlwdCwgZG9uJ3QgYm90aGVyIHByZWNvbXBp bGluZyBiZWNhdXNlIHRoZXJlIGlzCisgICAgLy8gbm8gd2hlcmUgdG8gY2FjaGUgaXQuCisgICAg Q2FjaGVkU2NyaXB0KiBjYWNoZWRTY3JpcHQgPSBzb3VyY2VDb2RlLmNhY2hlZFNjcmlwdCgpOwor ICAgIGlmICghY2FjaGVkU2NyaXB0KQorICAgICAgICByZXR1cm4gMDsKKworICAgIC8vIElmIHRo ZXJlIGlzIGNhY2hlZCBkYXRhLCB1c2UgaXQuCisgICAgUmVmUHRyPENhY2hlZE1ldGFkYXRhPiBj YWNoZWRNZXRhZGF0YSA9IGNhY2hlZFNjcmlwdC0+Y2FjaGVkTWV0YWRhdGEoZGF0YVR5cGVJRCk7 CisgICAgaWYgKGNhY2hlZE1ldGFkYXRhKSB7CisgICAgICAgIC8vIEZJWE1FIFNjcmlwdERhdGEg dGFrZXMgb3duZXJzaGlwIG9mIGRhdGEgd2hpY2ggZm9yY2VzIGFuIGV4dHJhIGNvcHkuCisgICAg ICAgIFZlY3Rvcjx1bnNpZ25lZD4gY29weTsKKworICAgICAgICBBU1NFUlQoY2FjaGVkTWV0YWRh dGEtPnNpemUoKSAlIGNoYXJUb1Vuc2lnbmVkRmFjdG9yID09IDApOworICAgICAgICBjb3B5LmFw cGVuZChyZWludGVycHJldF9jYXN0PHVuc2lnbmVkKj4oY29uc3RfY2FzdDxjaGFyKj4oY2FjaGVk TWV0YWRhdGEtPmRhdGEoKSkpLCBjYWNoZWRNZXRhZGF0YS0+c2l6ZSgpIC8gY2hhclRvVW5zaWdu ZWRGYWN0b3IpOworICAgICAgICBzaXplX3Qgc2l6ZSA9IGNvcHkuc2l6ZSgpOworICAgICAgICB1 bnNpZ25lZCogZGF0YSA9IGNvcHkucmVsZWFzZUJ1ZmZlcigpOworICAgICAgICByZXR1cm4gdjg6 OlNjcmlwdERhdGE6Ok5ldyhkYXRhLCBzaXplKTsKKyAgICB9CisKKyAgICAvLyBUaGVyZSBpcyBu byBjYWNoZWQgZGF0YSwgc28gZ2VuZXJhdGUgYW5kIGNhY2hlIGl0LgorICAgIHY4OjpTY3JpcHRE YXRhKiBzY3JpcHREYXRhID0gdjg6OlNjcmlwdERhdGE6OlByZUNvbXBpbGUoc291cmNlQ29kZS5z b3VyY2UoKS51dGY4KCkuZGF0YSgpLCBzb3VyY2VDb2RlLnNvdXJjZSgpLnV0ZjgoKS5sZW5ndGgo KSk7CisgICAgY2FjaGVkU2NyaXB0LT5zZXRDYWNoZWRNZXRhZGF0YShkYXRhVHlwZUlELCByZWlu dGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPihzY3JpcHREYXRhLT5EYXRhKCkpLCBzY3JpcHREYXRh LT5MZW5ndGgoKSAqIGNoYXJUb1Vuc2lnbmVkRmFjdG9yKTsKKworICAgIHJldHVybiBzY3JpcHRE YXRhOworfQorCiB2ODo6TG9jYWw8djg6OlZhbHVlPiBWOFByb3h5OjpldmFsdWF0ZShjb25zdCBT Y3JpcHRTb3VyY2VDb2RlJiBzb3VyY2UsIE5vZGUqIG5vZGUpCiB7CiAgICAgQVNTRVJUKHY4OjpD b250ZXh0OjpJbkNvbnRleHQoKSk7CkBAIC0zNjMsMTAgKzM5NiwxMSBAQCB2ODo6TG9jYWw8djg6 OlZhbHVlPiBWOFByb3h5OjpldmFsdWF0ZShjCiAjaWYgUExBVEZPUk0oQ0hST01JVU0pCiAgICAg ICAgIFBsYXRmb3JtQnJpZGdlOjp0cmFjZUV2ZW50QmVnaW4oInY4LmNvbXBpbGUiLCBub2RlLCAi Iik7CiAjZW5kaWYKKyAgICAgICAgT3duUHRyPHY4OjpTY3JpcHREYXRhPiBzY3JpcHREYXRhID0g cHJlY29tcGlsZVNjcmlwdChzb3VyY2UpOwogCiAgICAgICAgIC8vIE5PVEU6IEZvciBjb21wYXRp YmlsaXR5IHdpdGggV2ViQ29yZSwgU2NyaXB0U291cmNlQ29kZSdzIGxpbmUgc3RhcnRzIGF0CiAg ICAgICAgIC8vIDEsIHdoZXJlYXMgdjggc3RhcnRzIGF0IDAuCi0gICAgICAgIHY4OjpIYW5kbGU8 djg6OlNjcmlwdD4gc2NyaXB0ID0gY29tcGlsZVNjcmlwdChjb2RlLCBzb3VyY2UudXJsKCksIHNv dXJjZS5zdGFydExpbmUoKSAtIDEpOworICAgICAgICB2ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IHNj cmlwdCA9IGNvbXBpbGVTY3JpcHQoY29kZSwgc291cmNlLnVybCgpLCBzb3VyY2Uuc3RhcnRMaW5l KCkgLSAxLCBzY3JpcHREYXRhLmdldCgpKTsKICNpZiBQTEFURk9STShDSFJPTUlVTSkKICAgICAg ICAgUGxhdGZvcm1CcmlkZ2U6OnRyYWNlRXZlbnRFbmQoInY4LmNvbXBpbGUiLCBub2RlLCAiIik7 CiAKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCShyZXZpc2lvbiA1ODg1NSkKKysrIFdlYkNvcmUv YmluZGluZ3MvdjgvVjhQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yODQsNyArMjg0LDcgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gY2hlY2tOZXdMZWdhbChjb25zdCB2ODo6QXJndW1lbnRzJik7CiAKLSAgICAgICAgc3RhdGlj IHY4OjpIYW5kbGU8djg6OlNjcmlwdD4gY29tcGlsZVNjcmlwdCh2ODo6SGFuZGxlPHY4OjpTdHJp bmc+IGNvZGUsIGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGludCBiYXNlTGluZSk7CisgICAgICAg IHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IGNvbXBpbGVTY3JpcHQodjg6OkhhbmRsZTx2 ODo6U3RyaW5nPiBjb2RlLCBjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBpbnQgYmFzZUxpbmUsIHY4 OjpTY3JpcHREYXRhKiBzY3JpcHREYXRhID0gMCk7CiAKICAgICAgICAgLy8gSWYgdGhlIGV4Y2Vw dGlvbiBjb2RlIGlzIGRpZmZlcmVudCBmcm9tIHplcm8sIGEgRE9NIGV4Y2VwdGlvbiBpcwogICAg ICAgICAvLyBzY2hlZHVsZSB0byBiZSB0aHJvd24uCkBAIC0zMzMsNiArMzMzLDggQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZvaWQgcmVzZXRJc29sYXRlZFdvcmxkcygpOwogCisg ICAgICAgIFBhc3NPd25QdHI8djg6OlNjcmlwdERhdGE+IHByZWNvbXBpbGVTY3JpcHQoY29uc3Qg U2NyaXB0U291cmNlQ29kZSYgc291cmNlQ29kZSk7CisKICAgICAgICAgLy8gUmV0dXJucyBmYWxz ZSB3aGVuIHdlJ3JlIG91dCBvZiBtZW1vcnkgaW4gVjguCiAgICAgICAgIGJvb2wgc2V0SW5qZWN0 ZWRTY3JpcHRDb250ZXh0RGVidWdJZCh2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiB0YXJnZXRDb250 ZXh0KTsKIAo= 57269 2010-05-27 13:10:43 -0700 2010-05-28 11:19:52 -0700 Patch bug-38661-20100527131041.patch text/plain 6955 tonyg ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NmM5NjQ1MmIwNjVmMDRlMTE5MTgzZTBiNzNiMjgxNjRlNDY0NjA5Yy4uODEyZTE4YTUyMWY5MjYw ZTFhMjliNGQxNWUwYWE0MjA2YTU3OTUxMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wNS0yNyAgVG9u eSBHZW50aWxjb3JlICA8dG9ueWdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBlcnNpc3QgVjgncyBTY3JpcHREYXRhIHRvIHRo ZSBtZW1vcnkgY2FjaGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zODY2MQorCisgICAgICAgIFRoaXMgc3RvcmVzIFY4J3MgU2NyaXB0RGF0YSBpbiB0 aGUgbWVtb3J5IGNhY2hlIGFuZCBhbHNvIGNhdXNlcyB0aGUKKyAgICAgICAgbmV0d29yayBwbGF0 Zm9ybSBsYXllciB0byBiZSBub3RpZmllZCBvZiB0aGUgYXZhaWxhYmxlIGNhY2hlYWJsZQorICAg ICAgICBtZXRhZGF0YS4KKworICAgICAgICBDaHJvbWl1bSdzIG1vcmVqcyBiZW5jaG1hcmsgc2hv d3MgYSAzLTQlIGltcHJvdmVtZW50IG9uIGZhc3QgaGFyZHdhcmUuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIGJlY2F1c2Ugbm8gbmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBiaW5kaW5n cy92OC9TY3JpcHRTb3VyY2VDb2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRTb3VyY2VD b2RlOjpTY3JpcHRTb3VyY2VDb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdFNvdXJjZUNv ZGU6OmNhY2hlZFNjcmlwdCk6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhQcm94eS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpWOFByb3h5Ojpjb21waWxlU2NyaXB0KToKKyAgICAgICAgKFdlYkNv cmU6OlY4UHJveHk6OnByZWNvbXBpbGVTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6VjhQcm94 eTo6ZXZhbHVhdGUpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJveHkuaDoKKwogMjAxMC0w NS0yNyAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92 OC9TY3JpcHRTb3VyY2VDb2RlLmggYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFNvdXJjZUNv ZGUuaAppbmRleCA1YzE2MTY4ZTQxZjA2YjQyNjFkZTRhOTcwZGU2ZGUxYTU2NGM3MjYyLi5kYmM5 ZDVlNmZjNjAwN2ZjZmRkNjYwMjRkYjA3ODI2YzY2MjYzYjViIDEwMDY0NAotLS0gYS9XZWJDb3Jl L2JpbmRpbmdzL3Y4L1NjcmlwdFNvdXJjZUNvZGUuaAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1NjcmlwdFNvdXJjZUNvZGUuaApAQCAtMzEsNiArMzEsNyBAQAogI2lmbmRlZiBTY3JpcHRTb3Vy Y2VDb2RlX2gKICNkZWZpbmUgU2NyaXB0U291cmNlQ29kZV9oCiAKKyNpbmNsdWRlICJDYWNoZWRS ZXNvdXJjZUhhbmRsZS5oIgogI2luY2x1ZGUgIkNhY2hlZFNjcmlwdC5oIgogI2luY2x1ZGUgIktV UkwuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgpAQCAtNDEsNiArNDIsNyBAQCBjbGFz cyBTY3JpcHRTb3VyY2VDb2RlIHsKIHB1YmxpYzoKICAgICBTY3JpcHRTb3VyY2VDb2RlKGNvbnN0 IFN0cmluZyYgc291cmNlLCBjb25zdCBLVVJMJiB1cmwgPSBLVVJMKCksIGludCBzdGFydExpbmUg PSAxKQogICAgICAgICA6IG1fc291cmNlKHNvdXJjZSkKKyAgICAgICAgLCBtX2NhY2hlZFNjcmlw dCgwKQogICAgICAgICAsIG1fdXJsKHVybCkKICAgICAgICAgLCBtX3N0YXJ0TGluZShzdGFydExp bmUpCiAgICAgewpAQCAtNTAsNiArNTIsNyBAQCBwdWJsaWM6CiAgICAgLy8gTm90IHN1cmUgaWYg dGhhdCBtYXR0ZXJzLgogICAgIFNjcmlwdFNvdXJjZUNvZGUoQ2FjaGVkU2NyaXB0KiBjcykKICAg ICAgICAgOiBtX3NvdXJjZShjcy0+c2NyaXB0KCkpCisgICAgICAgICwgbV9jYWNoZWRTY3JpcHQo Y3MpCiAgICAgICAgICwgbV91cmwoUGFyc2VkVVJMU3RyaW5nLCBjcy0+dXJsKCkpCiAgICAgICAg ICwgbV9zdGFydExpbmUoMSkKICAgICB7CkBAIC01OCwxMSArNjEsMTMgQEAgcHVibGljOgogICAg IGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlLmlzRW1wdHkoKTsgfQogCiAg ICAgY29uc3QgU3RyaW5nJiBzb3VyY2UoKSBjb25zdCB7IHJldHVybiBtX3NvdXJjZTsgfQorICAg IENhY2hlZFNjcmlwdCogY2FjaGVkU2NyaXB0KCkgY29uc3QgeyByZXR1cm4gbV9jYWNoZWRTY3Jp cHQuZ2V0KCk7IH0KICAgICBjb25zdCBLVVJMJiB1cmwoKSBjb25zdCB7IHJldHVybiBtX3VybDsg fQogICAgIGludCBzdGFydExpbmUoKSBjb25zdCB7IHJldHVybiBtX3N0YXJ0TGluZTsgfQogCiBw cml2YXRlOgogICAgIFN0cmluZyBtX3NvdXJjZTsKKyAgICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxD YWNoZWRTY3JpcHQ+IG1fY2FjaGVkU2NyaXB0OwogICAgIEtVUkwgbV91cmw7CiAgICAgaW50IG1f c3RhcnRMaW5lOwogfTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5j cHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCmluZGV4IGQ3ZWY2ZjY3OGQxNjk5 YWFkYTNjM2Y2MWE2ZDM0MmZkOTNkZDliMGEuLjNjNmRkM2EyNjQ5MDAzY2ViZDUyNjZjMzcyY2U5 MDFjYzhhYjc2ZjQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAK KysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcApAQCAtMzEsNiArMzEsNyBAQAog I2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlY4UHJveHkuaCIKIAorI2luY2x1ZGUgIkNh Y2hlZE1ldGFkYXRhLmgiCiAjaW5jbHVkZSAiQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uaCIK ICNpbmNsdWRlICJEYXRlRXh0ZW5zaW9uLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRMb2FkZXIuaCIK QEAgLTcwLDYgKzcxLDcgQEAKICNpbmNsdWRlIDx2OC5oPgogI2luY2x1ZGUgPHd0Zi9Bc3NlcnRp b25zLmg+CiAjaW5jbHVkZSA8d3RmL093bkFycmF5UHRyLmg+CisjaW5jbHVkZSA8d3RmL093blB0 ci5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvU3RyaW5n RXh0cmFzLmg+CiAjaW5jbHVkZSA8d3RmL1VudXNlZFBhcmFtLmg+CkBAIC0yMzMsMTMgKzIzNSwx MyBAQCBWOFByb3h5Ojp+VjhQcm94eSgpCiAgICAgd2luZG93U2hlbGwoKS0+ZGVzdHJveUdsb2Jh bCgpOwogfQogCi12ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IFY4UHJveHk6OmNvbXBpbGVTY3JpcHQo djg6OkhhbmRsZTx2ODo6U3RyaW5nPiBjb2RlLCBjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBpbnQg YmFzZUxpbmUpCit2ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IFY4UHJveHk6OmNvbXBpbGVTY3JpcHQo djg6OkhhbmRsZTx2ODo6U3RyaW5nPiBjb2RlLCBjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBpbnQg YmFzZUxpbmUsIHY4OjpTY3JpcHREYXRhKiBzY3JpcHREYXRhKQogewogICAgIGNvbnN0IHVpbnQx Nl90KiBmaWxlTmFtZVN0cmluZyA9IGZyb21XZWJDb3JlU3RyaW5nKGZpbGVOYW1lKTsKICAgICB2 ODo6SGFuZGxlPHY4OjpTdHJpbmc+IG5hbWUgPSB2ODo6U3RyaW5nOjpOZXcoZmlsZU5hbWVTdHJp bmcsIGZpbGVOYW1lLmxlbmd0aCgpKTsKICAgICB2ODo6SGFuZGxlPHY4OjpJbnRlZ2VyPiBsaW5l ID0gdjg6OkludGVnZXI6Ok5ldyhiYXNlTGluZSk7CiAgICAgdjg6OlNjcmlwdE9yaWdpbiBvcmln aW4obmFtZSwgbGluZSk7Ci0gICAgdjg6OkhhbmRsZTx2ODo6U2NyaXB0PiBzY3JpcHQgPSB2ODo6 U2NyaXB0OjpDb21waWxlKGNvZGUsICZvcmlnaW4pOworICAgIHY4OjpIYW5kbGU8djg6OlNjcmlw dD4gc2NyaXB0ID0gdjg6OlNjcmlwdDo6Q29tcGlsZShjb2RlLCAmb3JpZ2luLCBzY3JpcHREYXRh KTsKICAgICByZXR1cm4gc2NyaXB0OwogfQogCkBAIC0zMzgsNiArMzQwLDI4IEBAIGJvb2wgVjhQ cm94eTo6c2V0SW5qZWN0ZWRTY3JpcHRDb250ZXh0RGVidWdJZCh2ODo6SGFuZGxlPHY4OjpDb250 ZXh0PiB0YXJnZXRDb250CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK1Bhc3NPd25QdHI8djg6OlNj cmlwdERhdGE+IFY4UHJveHk6OnByZWNvbXBpbGVTY3JpcHQoY29uc3QgU2NyaXB0U291cmNlQ29k ZSYgc291cmNlQ29kZSkKK3sKKyAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgZGF0YVR5cGVJRCA9 IDB4RUNDMTNCRDc7CisKKyAgICAvLyBJZiB0aGVyZSBpcyBubyBDYWNoZWRTY3JpcHQsIGRvbid0 IGJvdGhlciBwcmVjb21waWxpbmcgYmVjYXVzZSB0aGVyZSBpcworICAgIC8vIG5vIHdoZXJlIHRv IGNhY2hlIGl0LgorICAgIENhY2hlZFNjcmlwdCogY2FjaGVkU2NyaXB0ID0gc291cmNlQ29kZS5j YWNoZWRTY3JpcHQoKTsKKyAgICBpZiAoIWNhY2hlZFNjcmlwdCkKKyAgICAgICAgcmV0dXJuIDA7 CisKKyAgICAvLyBJZiB0aGVyZSBpcyBjYWNoZWQgZGF0YSwgdXNlIGl0LgorICAgIENhY2hlZE1l dGFkYXRhKiBjYWNoZWRNZXRhZGF0YSA9IGNhY2hlZFNjcmlwdC0+Y2FjaGVkTWV0YWRhdGEoZGF0 YVR5cGVJRCk7CisgICAgaWYgKGNhY2hlZE1ldGFkYXRhKQorICAgICAgICByZXR1cm4gdjg6OlNj cmlwdERhdGE6Ok5ldyhjYWNoZWRNZXRhZGF0YS0+ZGF0YSgpLCBjYWNoZWRNZXRhZGF0YS0+c2l6 ZSgpKTsKKworICAgIC8vIFRoZXJlIGlzIG5vIGNhY2hlZCBkYXRhLCBzbyBnZW5lcmF0ZSBhbmQg Y2FjaGUgaXQuCisgICAgdjg6OlNjcmlwdERhdGEqIHNjcmlwdERhdGEgPSB2ODo6U2NyaXB0RGF0 YTo6UHJlQ29tcGlsZShzb3VyY2VDb2RlLnNvdXJjZSgpLnV0ZjgoKS5kYXRhKCksIHNvdXJjZUNv ZGUuc291cmNlKCkudXRmOCgpLmxlbmd0aCgpKTsKKyAgICBjYWNoZWRTY3JpcHQtPnNldENhY2hl ZE1ldGFkYXRhKGRhdGFUeXBlSUQsIHNjcmlwdERhdGEtPkRhdGEoKSwgc2NyaXB0RGF0YS0+TGVu Z3RoKCkpOworCisgICAgcmV0dXJuIHNjcmlwdERhdGE7Cit9CisKIHY4OjpMb2NhbDx2ODo6VmFs dWU+IFY4UHJveHk6OmV2YWx1YXRlKGNvbnN0IFNjcmlwdFNvdXJjZUNvZGUmIHNvdXJjZSwgTm9k ZSogbm9kZSkKIHsKICAgICBBU1NFUlQodjg6OkNvbnRleHQ6OkluQ29udGV4dCgpKTsKQEAgLTM2 MywxMCArMzg3LDExIEBAIHY4OjpMb2NhbDx2ODo6VmFsdWU+IFY4UHJveHk6OmV2YWx1YXRlKGNv bnN0IFNjcmlwdFNvdXJjZUNvZGUmIHNvdXJjZSwgTm9kZSogbm9kCiAjaWYgUExBVEZPUk0oQ0hS T01JVU0pCiAgICAgICAgIFBsYXRmb3JtQnJpZGdlOjp0cmFjZUV2ZW50QmVnaW4oInY4LmNvbXBp bGUiLCBub2RlLCAiIik7CiAjZW5kaWYKKyAgICAgICAgT3duUHRyPHY4OjpTY3JpcHREYXRhPiBz Y3JpcHREYXRhID0gcHJlY29tcGlsZVNjcmlwdChzb3VyY2UpOwogCiAgICAgICAgIC8vIE5PVEU6 IEZvciBjb21wYXRpYmlsaXR5IHdpdGggV2ViQ29yZSwgU2NyaXB0U291cmNlQ29kZSdzIGxpbmUg c3RhcnRzIGF0CiAgICAgICAgIC8vIDEsIHdoZXJlYXMgdjggc3RhcnRzIGF0IDAuCi0gICAgICAg IHY4OjpIYW5kbGU8djg6OlNjcmlwdD4gc2NyaXB0ID0gY29tcGlsZVNjcmlwdChjb2RlLCBzb3Vy Y2UudXJsKCksIHNvdXJjZS5zdGFydExpbmUoKSAtIDEpOworICAgICAgICB2ODo6SGFuZGxlPHY4 OjpTY3JpcHQ+IHNjcmlwdCA9IGNvbXBpbGVTY3JpcHQoY29kZSwgc291cmNlLnVybCgpLCBzb3Vy Y2Uuc3RhcnRMaW5lKCkgLSAxLCBzY3JpcHREYXRhLmdldCgpKTsKICNpZiBQTEFURk9STShDSFJP TUlVTSkKICAgICAgICAgUGxhdGZvcm1CcmlkZ2U6OnRyYWNlRXZlbnRFbmQoInY4LmNvbXBpbGUi LCBub2RlLCAiIik7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5o IGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgKaW5kZXggMDk4ZDk1NmUyYzYyMGQ3MTU0 YzYyZTJlZTZkNGE1MzMyYTMwYzIwNC4uZDZiYTFhY2E3YzEwMTNiZDhkYTllNGUyMWRjZjNkMjJl MzJkMWY1NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgKKysrIGIv V2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgKQEAgLTI4NSw3ICsyODUsNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKICAgICAgICAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBjaGVj a05ld0xlZ2FsKGNvbnN0IHY4OjpBcmd1bWVudHMmKTsKIAotICAgICAgICBzdGF0aWMgdjg6Okhh bmRsZTx2ODo6U2NyaXB0PiBjb21waWxlU2NyaXB0KHY4OjpIYW5kbGU8djg6OlN0cmluZz4gY29k ZSwgY29uc3QgU3RyaW5nJiBmaWxlTmFtZSwgaW50IGJhc2VMaW5lKTsKKyAgICAgICAgc3RhdGlj IHY4OjpIYW5kbGU8djg6OlNjcmlwdD4gY29tcGlsZVNjcmlwdCh2ODo6SGFuZGxlPHY4OjpTdHJp bmc+IGNvZGUsIGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGludCBiYXNlTGluZSwgdjg6OlNjcmlw dERhdGEqIHNjcmlwdERhdGEgPSAwKTsKIAogICAgICAgICAvLyBJZiB0aGUgZXhjZXB0aW9uIGNv ZGUgaXMgZGlmZmVyZW50IGZyb20gemVybywgYSBET00gZXhjZXB0aW9uIGlzCiAgICAgICAgIC8v IHNjaGVkdWxlIHRvIGJlIHRocm93bi4KQEAgLTMzNyw2ICszMzcsOCBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKICAgICAgICAgdm9pZCByZXNldElzb2xhdGVkV29ybGRzKCk7CiAKKyAgICAgICAg UGFzc093blB0cjx2ODo6U2NyaXB0RGF0YT4gcHJlY29tcGlsZVNjcmlwdChjb25zdCBTY3JpcHRT b3VyY2VDb2RlJiBzb3VyY2VDb2RlKTsKKwogICAgICAgICAvLyBSZXR1cm5zIGZhbHNlIHdoZW4g d2UncmUgb3V0IG9mIG1lbW9yeSBpbiBWOC4KICAgICAgICAgYm9vbCBzZXRJbmplY3RlZFNjcmlw dENvbnRleHREZWJ1Z0lkKHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IHRhcmdldENvbnRleHQpOwog Cg== 57348 2010-05-28 11:19:56 -0700 2010-06-02 10:08:02 -0700 Patch bug-38661-20100528111955.patch text/plain 7100 tonyg ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWUzMGYyZmQ0YWU4ZjJhN2I0YjM2ODg1ZWQ4MTE1NDk1NWFmZGM3ZS4uYjU3ZTYzZThkNDJiN2Y3 NWRlMTUyYWUyNThlYmYwM2QyMDQ0MjRkMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wNS0yNyAgVG9u eSBHZW50aWxjb3JlICA8dG9ueWdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBlcnNpc3QgVjgncyBTY3JpcHREYXRhIHRvIHRo ZSBtZW1vcnkgY2FjaGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zODY2MQorCisgICAgICAgIFRoaXMgc3RvcmVzIFY4J3MgU2NyaXB0RGF0YSBpbiB0 aGUgbWVtb3J5IGNhY2hlIGFuZCBhbHNvIGNhdXNlcyB0aGUKKyAgICAgICAgbmV0d29yayBwbGF0 Zm9ybSBsYXllciB0byBiZSBub3RpZmllZCBvZiB0aGUgYXZhaWxhYmxlIGNhY2hlYWJsZQorICAg ICAgICBtZXRhZGF0YS4KKworICAgICAgICBDaHJvbWl1bSdzIG1vcmVqcyBiZW5jaG1hcmsgc2hv d3MgYSAzLTQlIGltcHJvdmVtZW50IG9uIGZhc3QgaGFyZHdhcmUuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIGJlY2F1c2Ugbm8gbmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBiaW5kaW5n cy92OC9TY3JpcHRTb3VyY2VDb2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRTb3VyY2VD b2RlOjpTY3JpcHRTb3VyY2VDb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdFNvdXJjZUNv ZGU6OmNhY2hlZFNjcmlwdCk6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhQcm94eS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpWOFByb3h5Ojpjb21waWxlU2NyaXB0KToKKyAgICAgICAgKFdlYkNv cmU6OlY4UHJveHk6OnByZWNvbXBpbGVTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6VjhQcm94 eTo6ZXZhbHVhdGUpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJveHkuaDoKKwogMjAxMC0w NS0yOCAgQWRhbSBUcmVhdCAgPGF0cmVhdEByaW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERhbmllbCBCYXRlcy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0U291 cmNlQ29kZS5oIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTb3VyY2VDb2RlLmgKaW5kZXgg NWMxNjE2OGU0MWYwNmI0MjYxZGU0YTk3MGRlNmRlMWE1NjRjNzI2Mi4uZGJjOWQ1ZTZmYzYwMDdm Y2ZkZDY2MDI0ZGIwNzgyNmM2NjI2M2I1YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92 OC9TY3JpcHRTb3VyY2VDb2RlLmgKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTb3Vy Y2VDb2RlLmgKQEAgLTMxLDYgKzMxLDcgQEAKICNpZm5kZWYgU2NyaXB0U291cmNlQ29kZV9oCiAj ZGVmaW5lIFNjcmlwdFNvdXJjZUNvZGVfaAogCisjaW5jbHVkZSAiQ2FjaGVkUmVzb3VyY2VIYW5k bGUuaCIKICNpbmNsdWRlICJDYWNoZWRTY3JpcHQuaCIKICNpbmNsdWRlICJLVVJMLmgiCiAjaW5j bHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKQEAgLTQxLDYgKzQyLDcgQEAgY2xhc3MgU2NyaXB0U291 cmNlQ29kZSB7CiBwdWJsaWM6CiAgICAgU2NyaXB0U291cmNlQ29kZShjb25zdCBTdHJpbmcmIHNv dXJjZSwgY29uc3QgS1VSTCYgdXJsID0gS1VSTCgpLCBpbnQgc3RhcnRMaW5lID0gMSkKICAgICAg ICAgOiBtX3NvdXJjZShzb3VyY2UpCisgICAgICAgICwgbV9jYWNoZWRTY3JpcHQoMCkKICAgICAg ICAgLCBtX3VybCh1cmwpCiAgICAgICAgICwgbV9zdGFydExpbmUoc3RhcnRMaW5lKQogICAgIHsK QEAgLTUwLDYgKzUyLDcgQEAgcHVibGljOgogICAgIC8vIE5vdCBzdXJlIGlmIHRoYXQgbWF0dGVy cy4KICAgICBTY3JpcHRTb3VyY2VDb2RlKENhY2hlZFNjcmlwdCogY3MpCiAgICAgICAgIDogbV9z b3VyY2UoY3MtPnNjcmlwdCgpKQorICAgICAgICAsIG1fY2FjaGVkU2NyaXB0KGNzKQogICAgICAg ICAsIG1fdXJsKFBhcnNlZFVSTFN0cmluZywgY3MtPnVybCgpKQogICAgICAgICAsIG1fc3RhcnRM aW5lKDEpCiAgICAgewpAQCAtNTgsMTEgKzYxLDEzIEBAIHB1YmxpYzoKICAgICBib29sIGlzRW1w dHkoKSBjb25zdCB7IHJldHVybiBtX3NvdXJjZS5pc0VtcHR5KCk7IH0KIAogICAgIGNvbnN0IFN0 cmluZyYgc291cmNlKCkgY29uc3QgeyByZXR1cm4gbV9zb3VyY2U7IH0KKyAgICBDYWNoZWRTY3Jp cHQqIGNhY2hlZFNjcmlwdCgpIGNvbnN0IHsgcmV0dXJuIG1fY2FjaGVkU2NyaXB0LmdldCgpOyB9 CiAgICAgY29uc3QgS1VSTCYgdXJsKCkgY29uc3QgeyByZXR1cm4gbV91cmw7IH0KICAgICBpbnQg c3RhcnRMaW5lKCkgY29uc3QgeyByZXR1cm4gbV9zdGFydExpbmU7IH0KIAogcHJpdmF0ZToKICAg ICBTdHJpbmcgbV9zb3VyY2U7CisgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkU2NyaXB0 PiBtX2NhY2hlZFNjcmlwdDsKICAgICBLVVJMIG1fdXJsOwogICAgIGludCBtX3N0YXJ0TGluZTsK IH07CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwIGIvV2ViQ29y ZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAppbmRleCBkN2VmNmY2NzhkMTY5OWFhZGEzYzNmNjFh NmQzNDJmZDkzZGQ5YjBhLi4wYjE2ZjNhMGRhMWVlZjljYTc2ZmQ1ODcyYTNjN2MwZThhNDhjOGM5 IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCisrKyBiL1dlYkNv cmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJj b25maWcuaCIKICNpbmNsdWRlICJWOFByb3h5LmgiCiAKKyNpbmNsdWRlICJDYWNoZWRNZXRhZGF0 YS5oIgogI2luY2x1ZGUgIkNTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmgiCiAjaW5jbHVkZSAi RGF0ZUV4dGVuc2lvbi5oIgogI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCkBAIC03MCw2ICs3 MSw3IEBACiAjaW5jbHVkZSA8djguaD4KICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgogI2lu Y2x1ZGUgPHd0Zi9Pd25BcnJheVB0ci5oPgorI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNs dWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+CiAjaW5jbHVkZSA8d3RmL1N0cmluZ0V4dHJhcy5oPgog I2luY2x1ZGUgPHd0Zi9VbnVzZWRQYXJhbS5oPgpAQCAtMjMzLDEzICsyMzUsMTMgQEAgVjhQcm94 eTo6flY4UHJveHkoKQogICAgIHdpbmRvd1NoZWxsKCktPmRlc3Ryb3lHbG9iYWwoKTsKIH0KIAot djg6OkhhbmRsZTx2ODo6U2NyaXB0PiBWOFByb3h5Ojpjb21waWxlU2NyaXB0KHY4OjpIYW5kbGU8 djg6OlN0cmluZz4gY29kZSwgY29uc3QgU3RyaW5nJiBmaWxlTmFtZSwgaW50IGJhc2VMaW5lKQor djg6OkhhbmRsZTx2ODo6U2NyaXB0PiBWOFByb3h5Ojpjb21waWxlU2NyaXB0KHY4OjpIYW5kbGU8 djg6OlN0cmluZz4gY29kZSwgY29uc3QgU3RyaW5nJiBmaWxlTmFtZSwgaW50IGJhc2VMaW5lLCB2 ODo6U2NyaXB0RGF0YSogc2NyaXB0RGF0YSkKIHsKICAgICBjb25zdCB1aW50MTZfdCogZmlsZU5h bWVTdHJpbmcgPSBmcm9tV2ViQ29yZVN0cmluZyhmaWxlTmFtZSk7CiAgICAgdjg6OkhhbmRsZTx2 ODo6U3RyaW5nPiBuYW1lID0gdjg6OlN0cmluZzo6TmV3KGZpbGVOYW1lU3RyaW5nLCBmaWxlTmFt ZS5sZW5ndGgoKSk7CiAgICAgdjg6OkhhbmRsZTx2ODo6SW50ZWdlcj4gbGluZSA9IHY4OjpJbnRl Z2VyOjpOZXcoYmFzZUxpbmUpOwogICAgIHY4OjpTY3JpcHRPcmlnaW4gb3JpZ2luKG5hbWUsIGxp bmUpOwotICAgIHY4OjpIYW5kbGU8djg6OlNjcmlwdD4gc2NyaXB0ID0gdjg6OlNjcmlwdDo6Q29t cGlsZShjb2RlLCAmb3JpZ2luKTsKKyAgICB2ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IHNjcmlwdCA9 IHY4OjpTY3JpcHQ6OkNvbXBpbGUoY29kZSwgJm9yaWdpbiwgc2NyaXB0RGF0YSk7CiAgICAgcmV0 dXJuIHNjcmlwdDsKIH0KIApAQCAtMzM4LDYgKzM0MCwzMyBAQCBib29sIFY4UHJveHk6OnNldElu amVjdGVkU2NyaXB0Q29udGV4dERlYnVnSWQodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gdGFyZ2V0 Q29udAogICAgIHJldHVybiB0cnVlOwogfQogCitQYXNzT3duUHRyPHY4OjpTY3JpcHREYXRhPiBW OFByb3h5OjpwcmVjb21waWxlU2NyaXB0KGNvbnN0IFNjcmlwdFNvdXJjZUNvZGUmIHNvdXJjZSkK K3sKKyAgICAvLyBBIHBzZXVkby1yYW5kb21seSBjaG9zZW4gSUQgdXNlZCB0byBzdG9yZSBhbmQg cmV0cmlldmUgVjggU2NyaXB0RGF0YSBmcm9tCisgICAgLy8gdGhlIENhY2hlZFNjcmlwdC4gSWYg dGhlIGZvcm1hdCBjaGFuZ2VzLCB0aGlzIElEIHNob3VsZCBiZSBjaGFuZ2VkIHRvby4KKyAgICBz dGF0aWMgY29uc3QgdW5zaWduZWQgZGF0YVR5cGVJRCA9IDB4RUNDMTNCRDc7CisKKyAgICAvLyBW ZXJ5IHNtYWxsIHNjcmlwdHMgYXJlIG5vdCB3b3J0aCB0aGUgZWZmb3J0IHRvIHByZXBhcnNlLgor ICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBtaW5QcmVwYXJzZUxlbmd0aCA9IDEwMjQ7CisKKyAg ICBDYWNoZWRTY3JpcHQqIGNhY2hlZFNjcmlwdCA9IHNvdXJjZS5jYWNoZWRTY3JpcHQoKTsKKyAg ICBpZiAoIWNhY2hlZFNjcmlwdCkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBDYWNoZWRNZXRh ZGF0YSogY2FjaGVkTWV0YWRhdGEgPSBjYWNoZWRTY3JpcHQtPmNhY2hlZE1ldGFkYXRhKGRhdGFU eXBlSUQpOworICAgIGlmIChjYWNoZWRNZXRhZGF0YSkKKyAgICAgICAgcmV0dXJuIHY4OjpTY3Jp cHREYXRhOjpOZXcoY2FjaGVkTWV0YWRhdGEtPmRhdGEoKSwgY2FjaGVkTWV0YWRhdGEtPnNpemUo KSk7CisKKyAgICBjb25zdCBDU3RyaW5nJiB1dGY4U291cmNlID0gc291cmNlLnNvdXJjZSgpLnV0 ZjgoKTsKKyAgICBpZiAodXRmOFNvdXJjZS5sZW5ndGgoKSA8IG1pblByZXBhcnNlTGVuZ3RoKQor ICAgICAgICByZXR1cm4gMDsKKworICAgIHY4OjpTY3JpcHREYXRhKiBzY3JpcHREYXRhID0gdjg6 OlNjcmlwdERhdGE6OlByZUNvbXBpbGUodXRmOFNvdXJjZS5kYXRhKCksIHV0ZjhTb3VyY2UubGVu Z3RoKCkpOworICAgIGNhY2hlZFNjcmlwdC0+c2V0Q2FjaGVkTWV0YWRhdGEoZGF0YVR5cGVJRCwg c2NyaXB0RGF0YS0+RGF0YSgpLCBzY3JpcHREYXRhLT5MZW5ndGgoKSk7CisKKyAgICByZXR1cm4g c2NyaXB0RGF0YTsKK30KKwogdjg6OkxvY2FsPHY4OjpWYWx1ZT4gVjhQcm94eTo6ZXZhbHVhdGUo Y29uc3QgU2NyaXB0U291cmNlQ29kZSYgc291cmNlLCBOb2RlKiBub2RlKQogewogICAgIEFTU0VS VCh2ODo6Q29udGV4dDo6SW5Db250ZXh0KCkpOwpAQCAtMzYzLDEwICszOTIsMTEgQEAgdjg6Okxv Y2FsPHY4OjpWYWx1ZT4gVjhQcm94eTo6ZXZhbHVhdGUoY29uc3QgU2NyaXB0U291cmNlQ29kZSYg c291cmNlLCBOb2RlKiBub2QKICNpZiBQTEFURk9STShDSFJPTUlVTSkKICAgICAgICAgUGxhdGZv cm1CcmlkZ2U6OnRyYWNlRXZlbnRCZWdpbigidjguY29tcGlsZSIsIG5vZGUsICIiKTsKICNlbmRp ZgorICAgICAgICBPd25QdHI8djg6OlNjcmlwdERhdGE+IHNjcmlwdERhdGEgPSBwcmVjb21waWxl U2NyaXB0KHNvdXJjZSk7CiAKICAgICAgICAgLy8gTk9URTogRm9yIGNvbXBhdGliaWxpdHkgd2l0 aCBXZWJDb3JlLCBTY3JpcHRTb3VyY2VDb2RlJ3MgbGluZSBzdGFydHMgYXQKICAgICAgICAgLy8g MSwgd2hlcmVhcyB2OCBzdGFydHMgYXQgMC4KLSAgICAgICAgdjg6OkhhbmRsZTx2ODo6U2NyaXB0 PiBzY3JpcHQgPSBjb21waWxlU2NyaXB0KGNvZGUsIHNvdXJjZS51cmwoKSwgc291cmNlLnN0YXJ0 TGluZSgpIC0gMSk7CisgICAgICAgIHY4OjpIYW5kbGU8djg6OlNjcmlwdD4gc2NyaXB0ID0gY29t cGlsZVNjcmlwdChjb2RlLCBzb3VyY2UudXJsKCksIHNvdXJjZS5zdGFydExpbmUoKSAtIDEsIHNj cmlwdERhdGEuZ2V0KCkpOwogI2lmIFBMQVRGT1JNKENIUk9NSVVNKQogICAgICAgICBQbGF0Zm9y bUJyaWRnZTo6dHJhY2VFdmVudEVuZCgidjguY29tcGlsZSIsIG5vZGUsICIiKTsKIApkaWZmIC0t Z2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmggYi9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4UHJveHkuaAppbmRleCAwOThkOTU2ZTJjNjIwZDcxNTRjNjJlMmVlNmQ0YTUzMzJhMzBjMjA0 Li41OTJhMjI2ZjBjYjUwYTQ1ZjQ4MjMxNDJlY2FmNWViNmVjMWNlOTdhIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuaAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 UHJveHkuaApAQCAtMjg1LDcgKzI4NSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAg ICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGNoZWNrTmV3TGVnYWwoY29uc3Qgdjg6OkFy Z3VtZW50cyYpOwogCi0gICAgICAgIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IGNvbXBp bGVTY3JpcHQodjg6OkhhbmRsZTx2ODo6U3RyaW5nPiBjb2RlLCBjb25zdCBTdHJpbmcmIGZpbGVO YW1lLCBpbnQgYmFzZUxpbmUpOworICAgICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6U2NyaXB0 PiBjb21waWxlU2NyaXB0KHY4OjpIYW5kbGU8djg6OlN0cmluZz4gY29kZSwgY29uc3QgU3RyaW5n JiBmaWxlTmFtZSwgaW50IGJhc2VMaW5lLCB2ODo6U2NyaXB0RGF0YSogc2NyaXB0RGF0YSA9IDAp OwogCiAgICAgICAgIC8vIElmIHRoZSBleGNlcHRpb24gY29kZSBpcyBkaWZmZXJlbnQgZnJvbSB6 ZXJvLCBhIERPTSBleGNlcHRpb24gaXMKICAgICAgICAgLy8gc2NoZWR1bGUgdG8gYmUgdGhyb3du LgpAQCAtMzM3LDYgKzMzNyw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2b2lk IHJlc2V0SXNvbGF0ZWRXb3JsZHMoKTsKIAorICAgICAgICBQYXNzT3duUHRyPHY4OjpTY3JpcHRE YXRhPiBwcmVjb21waWxlU2NyaXB0KGNvbnN0IFNjcmlwdFNvdXJjZUNvZGUmIHNvdXJjZSk7CisK ICAgICAgICAgLy8gUmV0dXJucyBmYWxzZSB3aGVuIHdlJ3JlIG91dCBvZiBtZW1vcnkgaW4gVjgu CiAgICAgICAgIGJvb2wgc2V0SW5qZWN0ZWRTY3JpcHRDb250ZXh0RGVidWdJZCh2ODo6SGFuZGxl PHY4OjpDb250ZXh0PiB0YXJnZXRDb250ZXh0KTsKIAo= 57664 2010-06-02 10:08:07 -0700 2010-06-03 11:32:05 -0700 Same patch triggering chromium EWS bot run bug-38661-20100602100805.patch text/plain 7116 tonyg ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjBhYzliZTM1MmI0N2NiNDJlMTgxNTI3ZDBhYmRkNjcxZTRlNzM1Ni4uNzc4M2ZiODk2NmVkYzY4 ZDJmNDM0MGVmZjYwZTJmODcxZDEwYjBhOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wNS0yNyAgVG9u eSBHZW50aWxjb3JlICA8dG9ueWdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBlcnNpc3QgVjgncyBTY3JpcHREYXRhIHRvIHRo ZSBtZW1vcnkgY2FjaGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zODY2MQorCisgICAgICAgIFRoaXMgc3RvcmVzIFY4J3MgU2NyaXB0RGF0YSBpbiB0 aGUgbWVtb3J5IGNhY2hlIGFuZCBhbHNvIGNhdXNlcyB0aGUKKyAgICAgICAgbmV0d29yayBwbGF0 Zm9ybSBsYXllciB0byBiZSBub3RpZmllZCBvZiB0aGUgYXZhaWxhYmxlIGNhY2hlYWJsZQorICAg ICAgICBtZXRhZGF0YS4KKworICAgICAgICBDaHJvbWl1bSdzIG1vcmVqcyBiZW5jaG1hcmsgc2hv d3MgYSAzLTQlIGltcHJvdmVtZW50IG9uIGZhc3QgaGFyZHdhcmUuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIGJlY2F1c2Ugbm8gbmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBiaW5kaW5n cy92OC9TY3JpcHRTb3VyY2VDb2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRTb3VyY2VD b2RlOjpTY3JpcHRTb3VyY2VDb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdFNvdXJjZUNv ZGU6OmNhY2hlZFNjcmlwdCk6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhQcm94eS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpWOFByb3h5Ojpjb21waWxlU2NyaXB0KToKKyAgICAgICAgKFdlYkNv cmU6OlY4UHJveHk6OnByZWNvbXBpbGVTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6VjhQcm94 eTo6ZXZhbHVhdGUpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJveHkuaDoKKwogMjAxMC0w Ni0wMiAgTWlraGFpbCBOYWdhbm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1NjcmlwdFNvdXJjZUNvZGUuaCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0U291 cmNlQ29kZS5oCmluZGV4IDVjMTYxNjhlNDFmMDZiNDI2MWRlNGE5NzBkZTZkZTFhNTY0YzcyNjIu LmRiYzlkNWU2ZmM2MDA3ZmNmZGQ2NjAyNGRiMDc4MjZjNjYyNjNiNWIgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0U291cmNlQ29kZS5oCisrKyBiL1dlYkNvcmUvYmluZGlu Z3MvdjgvU2NyaXB0U291cmNlQ29kZS5oCkBAIC0zMSw2ICszMSw3IEBACiAjaWZuZGVmIFNjcmlw dFNvdXJjZUNvZGVfaAogI2RlZmluZSBTY3JpcHRTb3VyY2VDb2RlX2gKIAorI2luY2x1ZGUgIkNh Y2hlZFJlc291cmNlSGFuZGxlLmgiCiAjaW5jbHVkZSAiQ2FjaGVkU2NyaXB0LmgiCiAjaW5jbHVk ZSAiS1VSTC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCkBAIC00MSw2ICs0Miw3IEBA IGNsYXNzIFNjcmlwdFNvdXJjZUNvZGUgewogcHVibGljOgogICAgIFNjcmlwdFNvdXJjZUNvZGUo Y29uc3QgU3RyaW5nJiBzb3VyY2UsIGNvbnN0IEtVUkwmIHVybCA9IEtVUkwoKSwgaW50IHN0YXJ0 TGluZSA9IDEpCiAgICAgICAgIDogbV9zb3VyY2Uoc291cmNlKQorICAgICAgICAsIG1fY2FjaGVk U2NyaXB0KDApCiAgICAgICAgICwgbV91cmwodXJsKQogICAgICAgICAsIG1fc3RhcnRMaW5lKHN0 YXJ0TGluZSkKICAgICB7CkBAIC01MCw2ICs1Miw3IEBAIHB1YmxpYzoKICAgICAvLyBOb3Qgc3Vy ZSBpZiB0aGF0IG1hdHRlcnMuCiAgICAgU2NyaXB0U291cmNlQ29kZShDYWNoZWRTY3JpcHQqIGNz KQogICAgICAgICA6IG1fc291cmNlKGNzLT5zY3JpcHQoKSkKKyAgICAgICAgLCBtX2NhY2hlZFNj cmlwdChjcykKICAgICAgICAgLCBtX3VybChQYXJzZWRVUkxTdHJpbmcsIGNzLT51cmwoKSkKICAg ICAgICAgLCBtX3N0YXJ0TGluZSgxKQogICAgIHsKQEAgLTU4LDExICs2MSwxMyBAQCBwdWJsaWM6 CiAgICAgYm9vbCBpc0VtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9zb3VyY2UuaXNFbXB0eSgpOyB9 CiAKICAgICBjb25zdCBTdHJpbmcmIHNvdXJjZSgpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlOyB9 CisgICAgQ2FjaGVkU2NyaXB0KiBjYWNoZWRTY3JpcHQoKSBjb25zdCB7IHJldHVybiBtX2NhY2hl ZFNjcmlwdC5nZXQoKTsgfQogICAgIGNvbnN0IEtVUkwmIHVybCgpIGNvbnN0IHsgcmV0dXJuIG1f dXJsOyB9CiAgICAgaW50IHN0YXJ0TGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3RhcnRMaW5lOyB9 CiAKIHByaXZhdGU6CiAgICAgU3RyaW5nIG1fc291cmNlOworICAgIENhY2hlZFJlc291cmNlSGFu ZGxlPENhY2hlZFNjcmlwdD4gbV9jYWNoZWRTY3JpcHQ7CiAgICAgS1VSTCBtX3VybDsKICAgICBp bnQgbV9zdGFydExpbmU7CiB9OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFBy b3h5LmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAKaW5kZXggZDdlZjZmNjc4 ZDE2OTlhYWRhM2MzZjYxYTZkMzQyZmQ5M2RkOWIwYS4uMGIxNmYzYTBkYTFlZWY5Y2E3NmZkNTg3 MmEzYzdjMGU4YTQ4YzhjOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5 LmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCkBAIC0zMSw2ICszMSw3 IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiVjhQcm94eS5oIgogCisjaW5jbHVk ZSAiQ2FjaGVkTWV0YWRhdGEuaCIKICNpbmNsdWRlICJDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlv bi5oIgogI2luY2x1ZGUgIkRhdGVFeHRlbnNpb24uaCIKICNpbmNsdWRlICJEb2N1bWVudExvYWRl ci5oIgpAQCAtNzAsNiArNzEsNyBAQAogI2luY2x1ZGUgPHY4Lmg+CiAjaW5jbHVkZSA8d3RmL0Fz c2VydGlvbnMuaD4KICNpbmNsdWRlIDx3dGYvT3duQXJyYXlQdHIuaD4KKyNpbmNsdWRlIDx3dGYv T3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogI2luY2x1ZGUgPHd0Zi9T dHJpbmdFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvVW51c2VkUGFyYW0uaD4KQEAgLTIzMywxMyAr MjM1LDEzIEBAIFY4UHJveHk6On5WOFByb3h5KCkKICAgICB3aW5kb3dTaGVsbCgpLT5kZXN0cm95 R2xvYmFsKCk7CiB9CiAKLXY4OjpIYW5kbGU8djg6OlNjcmlwdD4gVjhQcm94eTo6Y29tcGlsZVNj cmlwdCh2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGNvZGUsIGNvbnN0IFN0cmluZyYgZmlsZU5hbWUs IGludCBiYXNlTGluZSkKK3Y4OjpIYW5kbGU8djg6OlNjcmlwdD4gVjhQcm94eTo6Y29tcGlsZVNj cmlwdCh2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGNvZGUsIGNvbnN0IFN0cmluZyYgZmlsZU5hbWUs IGludCBiYXNlTGluZSwgdjg6OlNjcmlwdERhdGEqIHNjcmlwdERhdGEpCiB7CiAgICAgY29uc3Qg dWludDE2X3QqIGZpbGVOYW1lU3RyaW5nID0gZnJvbVdlYkNvcmVTdHJpbmcoZmlsZU5hbWUpOwog ICAgIHY4OjpIYW5kbGU8djg6OlN0cmluZz4gbmFtZSA9IHY4OjpTdHJpbmc6Ok5ldyhmaWxlTmFt ZVN0cmluZywgZmlsZU5hbWUubGVuZ3RoKCkpOwogICAgIHY4OjpIYW5kbGU8djg6OkludGVnZXI+ IGxpbmUgPSB2ODo6SW50ZWdlcjo6TmV3KGJhc2VMaW5lKTsKICAgICB2ODo6U2NyaXB0T3JpZ2lu IG9yaWdpbihuYW1lLCBsaW5lKTsKLSAgICB2ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IHNjcmlwdCA9 IHY4OjpTY3JpcHQ6OkNvbXBpbGUoY29kZSwgJm9yaWdpbik7CisgICAgdjg6OkhhbmRsZTx2ODo6 U2NyaXB0PiBzY3JpcHQgPSB2ODo6U2NyaXB0OjpDb21waWxlKGNvZGUsICZvcmlnaW4sIHNjcmlw dERhdGEpOwogICAgIHJldHVybiBzY3JpcHQ7CiB9CiAKQEAgLTMzOCw2ICszNDAsMzMgQEAgYm9v bCBWOFByb3h5OjpzZXRJbmplY3RlZFNjcmlwdENvbnRleHREZWJ1Z0lkKHY4OjpIYW5kbGU8djg6 OkNvbnRleHQ+IHRhcmdldENvbnQKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorUGFzc093blB0cjx2 ODo6U2NyaXB0RGF0YT4gVjhQcm94eTo6cHJlY29tcGlsZVNjcmlwdChjb25zdCBTY3JpcHRTb3Vy Y2VDb2RlJiBzb3VyY2UpCit7CisgICAgLy8gQSBwc2V1ZG8tcmFuZG9tbHkgY2hvc2VuIElEIHVz ZWQgdG8gc3RvcmUgYW5kIHJldHJpZXZlIFY4IFNjcmlwdERhdGEgZnJvbQorICAgIC8vIHRoZSBD YWNoZWRTY3JpcHQuIElmIHRoZSBmb3JtYXQgY2hhbmdlcywgdGhpcyBJRCBzaG91bGQgYmUgY2hh bmdlZCB0b28uCisgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIGRhdGFUeXBlSUQgPSAweEVDQzEz QkQ3OworCisgICAgLy8gVmVyeSBzbWFsbCBzY3JpcHRzIGFyZSBub3Qgd29ydGggdGhlIGVmZm9y dCB0byBwcmVwYXJzZS4KKyAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgbWluUHJlcGFyc2VMZW5n dGggPSAxMDI0OworCisgICAgQ2FjaGVkU2NyaXB0KiBjYWNoZWRTY3JpcHQgPSBzb3VyY2UuY2Fj aGVkU2NyaXB0KCk7CisgICAgaWYgKCFjYWNoZWRTY3JpcHQpCisgICAgICAgIHJldHVybiAwOwor CisgICAgQ2FjaGVkTWV0YWRhdGEqIGNhY2hlZE1ldGFkYXRhID0gY2FjaGVkU2NyaXB0LT5jYWNo ZWRNZXRhZGF0YShkYXRhVHlwZUlEKTsKKyAgICBpZiAoY2FjaGVkTWV0YWRhdGEpCisgICAgICAg IHJldHVybiB2ODo6U2NyaXB0RGF0YTo6TmV3KGNhY2hlZE1ldGFkYXRhLT5kYXRhKCksIGNhY2hl ZE1ldGFkYXRhLT5zaXplKCkpOworCisgICAgY29uc3QgQ1N0cmluZyYgdXRmOFNvdXJjZSA9IHNv dXJjZS5zb3VyY2UoKS51dGY4KCk7CisgICAgaWYgKHV0ZjhTb3VyY2UubGVuZ3RoKCkgPCBtaW5Q cmVwYXJzZUxlbmd0aCkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICB2ODo6U2NyaXB0RGF0YSog c2NyaXB0RGF0YSA9IHY4OjpTY3JpcHREYXRhOjpQcmVDb21waWxlKHV0ZjhTb3VyY2UuZGF0YSgp LCB1dGY4U291cmNlLmxlbmd0aCgpKTsKKyAgICBjYWNoZWRTY3JpcHQtPnNldENhY2hlZE1ldGFk YXRhKGRhdGFUeXBlSUQsIHNjcmlwdERhdGEtPkRhdGEoKSwgc2NyaXB0RGF0YS0+TGVuZ3RoKCkp OworCisgICAgcmV0dXJuIHNjcmlwdERhdGE7Cit9CisKIHY4OjpMb2NhbDx2ODo6VmFsdWU+IFY4 UHJveHk6OmV2YWx1YXRlKGNvbnN0IFNjcmlwdFNvdXJjZUNvZGUmIHNvdXJjZSwgTm9kZSogbm9k ZSkKIHsKICAgICBBU1NFUlQodjg6OkNvbnRleHQ6OkluQ29udGV4dCgpKTsKQEAgLTM2MywxMCAr MzkyLDExIEBAIHY4OjpMb2NhbDx2ODo6VmFsdWU+IFY4UHJveHk6OmV2YWx1YXRlKGNvbnN0IFNj cmlwdFNvdXJjZUNvZGUmIHNvdXJjZSwgTm9kZSogbm9kCiAjaWYgUExBVEZPUk0oQ0hST01JVU0p CiAgICAgICAgIFBsYXRmb3JtQnJpZGdlOjp0cmFjZUV2ZW50QmVnaW4oInY4LmNvbXBpbGUiLCBu b2RlLCAiIik7CiAjZW5kaWYKKyAgICAgICAgT3duUHRyPHY4OjpTY3JpcHREYXRhPiBzY3JpcHRE YXRhID0gcHJlY29tcGlsZVNjcmlwdChzb3VyY2UpOwogCiAgICAgICAgIC8vIE5PVEU6IEZvciBj b21wYXRpYmlsaXR5IHdpdGggV2ViQ29yZSwgU2NyaXB0U291cmNlQ29kZSdzIGxpbmUgc3RhcnRz IGF0CiAgICAgICAgIC8vIDEsIHdoZXJlYXMgdjggc3RhcnRzIGF0IDAuCi0gICAgICAgIHY4OjpI YW5kbGU8djg6OlNjcmlwdD4gc2NyaXB0ID0gY29tcGlsZVNjcmlwdChjb2RlLCBzb3VyY2UudXJs KCksIHNvdXJjZS5zdGFydExpbmUoKSAtIDEpOworICAgICAgICB2ODo6SGFuZGxlPHY4OjpTY3Jp cHQ+IHNjcmlwdCA9IGNvbXBpbGVTY3JpcHQoY29kZSwgc291cmNlLnVybCgpLCBzb3VyY2Uuc3Rh cnRMaW5lKCkgLSAxLCBzY3JpcHREYXRhLmdldCgpKTsKICNpZiBQTEFURk9STShDSFJPTUlVTSkK ICAgICAgICAgUGxhdGZvcm1CcmlkZ2U6OnRyYWNlRXZlbnRFbmQoInY4LmNvbXBpbGUiLCBub2Rl LCAiIik7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oIGIvV2Vi Q29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgKaW5kZXggMDk4ZDk1NmUyYzYyMGQ3MTU0YzYyZTJl ZTZkNGE1MzMyYTMwYzIwNC4uNTkyYTIyNmYwY2I1MGE0NWY0ODIzMTQyZWNhZjVlYjZlYzFjZTk3 YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgKKysrIGIvV2ViQ29y ZS9iaW5kaW5ncy92OC9WOFByb3h5LmgKQEAgLTI4NSw3ICsyODUsNyBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKICAgICAgICAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBjaGVja05ld0xl Z2FsKGNvbnN0IHY4OjpBcmd1bWVudHMmKTsKIAotICAgICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2 ODo6U2NyaXB0PiBjb21waWxlU2NyaXB0KHY4OjpIYW5kbGU8djg6OlN0cmluZz4gY29kZSwgY29u c3QgU3RyaW5nJiBmaWxlTmFtZSwgaW50IGJhc2VMaW5lKTsKKyAgICAgICAgc3RhdGljIHY4OjpI YW5kbGU8djg6OlNjcmlwdD4gY29tcGlsZVNjcmlwdCh2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGNv ZGUsIGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGludCBiYXNlTGluZSwgdjg6OlNjcmlwdERhdGEq IHNjcmlwdERhdGEgPSAwKTsKIAogICAgICAgICAvLyBJZiB0aGUgZXhjZXB0aW9uIGNvZGUgaXMg ZGlmZmVyZW50IGZyb20gemVybywgYSBET00gZXhjZXB0aW9uIGlzCiAgICAgICAgIC8vIHNjaGVk dWxlIHRvIGJlIHRocm93bi4KQEAgLTMzNyw2ICszMzcsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKICAgICAgICAgdm9pZCByZXNldElzb2xhdGVkV29ybGRzKCk7CiAKKyAgICAgICAgUGFzc093 blB0cjx2ODo6U2NyaXB0RGF0YT4gcHJlY29tcGlsZVNjcmlwdChjb25zdCBTY3JpcHRTb3VyY2VD b2RlJiBzb3VyY2UpOworCiAgICAgICAgIC8vIFJldHVybnMgZmFsc2Ugd2hlbiB3ZSdyZSBvdXQg b2YgbWVtb3J5IGluIFY4LgogICAgICAgICBib29sIHNldEluamVjdGVkU2NyaXB0Q29udGV4dERl YnVnSWQodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gdGFyZ2V0Q29udGV4dCk7CiAK 57795 2010-06-03 11:32:10 -0700 2010-06-14 13:29:59 -0700 Identical patch. r60622 has the DEP roll this needed, trigger another EWS run to verify. bug-38661-20100603113209.patch text/plain 7120 tonyg ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZmY2ZGMxNjhkZTkxNGZjYzRiYTk3YjJkY2VhNGIzMjhmMTg4YTI4My4uYWVmYTg5Zjc1MThlOTA2 YTU3OTg1OWE1MDE2NGNjZjI1YzM2ZWJhYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wNS0yNyAgVG9u eSBHZW50aWxjb3JlICA8dG9ueWdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBlcnNpc3QgVjgncyBTY3JpcHREYXRhIHRvIHRo ZSBtZW1vcnkgY2FjaGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zODY2MQorCisgICAgICAgIFRoaXMgc3RvcmVzIFY4J3MgU2NyaXB0RGF0YSBpbiB0 aGUgbWVtb3J5IGNhY2hlIGFuZCBhbHNvIGNhdXNlcyB0aGUKKyAgICAgICAgbmV0d29yayBwbGF0 Zm9ybSBsYXllciB0byBiZSBub3RpZmllZCBvZiB0aGUgYXZhaWxhYmxlIGNhY2hlYWJsZQorICAg ICAgICBtZXRhZGF0YS4KKworICAgICAgICBDaHJvbWl1bSdzIG1vcmVqcyBiZW5jaG1hcmsgc2hv d3MgYSAzLTQlIGltcHJvdmVtZW50IG9uIGZhc3QgaGFyZHdhcmUuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIGJlY2F1c2Ugbm8gbmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBiaW5kaW5n cy92OC9TY3JpcHRTb3VyY2VDb2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRTb3VyY2VD b2RlOjpTY3JpcHRTb3VyY2VDb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdFNvdXJjZUNv ZGU6OmNhY2hlZFNjcmlwdCk6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhQcm94eS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpWOFByb3h5Ojpjb21waWxlU2NyaXB0KToKKyAgICAgICAgKFdlYkNv cmU6OlY4UHJveHk6OnByZWNvbXBpbGVTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6VjhQcm94 eTo6ZXZhbHVhdGUpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJveHkuaDoKKwogMjAxMC0w Ni0wMyAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjYwNjE0LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9i aW5kaW5ncy92OC9TY3JpcHRTb3VyY2VDb2RlLmggYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Njcmlw dFNvdXJjZUNvZGUuaAppbmRleCA1YzE2MTY4ZTQxZjA2YjQyNjFkZTRhOTcwZGU2ZGUxYTU2NGM3 MjYyLi5kYmM5ZDVlNmZjNjAwN2ZjZmRkNjYwMjRkYjA3ODI2YzY2MjYzYjViIDEwMDY0NAotLS0g YS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFNvdXJjZUNvZGUuaAorKysgYi9XZWJDb3JlL2Jp bmRpbmdzL3Y4L1NjcmlwdFNvdXJjZUNvZGUuaApAQCAtMzEsNiArMzEsNyBAQAogI2lmbmRlZiBT Y3JpcHRTb3VyY2VDb2RlX2gKICNkZWZpbmUgU2NyaXB0U291cmNlQ29kZV9oCiAKKyNpbmNsdWRl ICJDYWNoZWRSZXNvdXJjZUhhbmRsZS5oIgogI2luY2x1ZGUgIkNhY2hlZFNjcmlwdC5oIgogI2lu Y2x1ZGUgIktVUkwuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgpAQCAtNDEsNiArNDIs NyBAQCBjbGFzcyBTY3JpcHRTb3VyY2VDb2RlIHsKIHB1YmxpYzoKICAgICBTY3JpcHRTb3VyY2VD b2RlKGNvbnN0IFN0cmluZyYgc291cmNlLCBjb25zdCBLVVJMJiB1cmwgPSBLVVJMKCksIGludCBz dGFydExpbmUgPSAxKQogICAgICAgICA6IG1fc291cmNlKHNvdXJjZSkKKyAgICAgICAgLCBtX2Nh Y2hlZFNjcmlwdCgwKQogICAgICAgICAsIG1fdXJsKHVybCkKICAgICAgICAgLCBtX3N0YXJ0TGlu ZShzdGFydExpbmUpCiAgICAgewpAQCAtNTAsNiArNTIsNyBAQCBwdWJsaWM6CiAgICAgLy8gTm90 IHN1cmUgaWYgdGhhdCBtYXR0ZXJzLgogICAgIFNjcmlwdFNvdXJjZUNvZGUoQ2FjaGVkU2NyaXB0 KiBjcykKICAgICAgICAgOiBtX3NvdXJjZShjcy0+c2NyaXB0KCkpCisgICAgICAgICwgbV9jYWNo ZWRTY3JpcHQoY3MpCiAgICAgICAgICwgbV91cmwoUGFyc2VkVVJMU3RyaW5nLCBjcy0+dXJsKCkp CiAgICAgICAgICwgbV9zdGFydExpbmUoMSkKICAgICB7CkBAIC01OCwxMSArNjEsMTMgQEAgcHVi bGljOgogICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlLmlzRW1wdHko KTsgfQogCiAgICAgY29uc3QgU3RyaW5nJiBzb3VyY2UoKSBjb25zdCB7IHJldHVybiBtX3NvdXJj ZTsgfQorICAgIENhY2hlZFNjcmlwdCogY2FjaGVkU2NyaXB0KCkgY29uc3QgeyByZXR1cm4gbV9j YWNoZWRTY3JpcHQuZ2V0KCk7IH0KICAgICBjb25zdCBLVVJMJiB1cmwoKSBjb25zdCB7IHJldHVy biBtX3VybDsgfQogICAgIGludCBzdGFydExpbmUoKSBjb25zdCB7IHJldHVybiBtX3N0YXJ0TGlu ZTsgfQogCiBwcml2YXRlOgogICAgIFN0cmluZyBtX3NvdXJjZTsKKyAgICBDYWNoZWRSZXNvdXJj ZUhhbmRsZTxDYWNoZWRTY3JpcHQ+IG1fY2FjaGVkU2NyaXB0OwogICAgIEtVUkwgbV91cmw7CiAg ICAgaW50IG1fc3RhcnRMaW5lOwogfTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3Mvdjgv VjhQcm94eS5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCmluZGV4IGQ3ZWY2 ZjY3OGQxNjk5YWFkYTNjM2Y2MWE2ZDM0MmZkOTNkZDliMGEuLjBiMTZmM2EwZGExZWVmOWNhNzZm ZDU4NzJhM2M3YzBlOGE0OGM4YzkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQ cm94eS5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcApAQCAtMzEsNiAr MzEsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlY4UHJveHkuaCIKIAorI2lu Y2x1ZGUgIkNhY2hlZE1ldGFkYXRhLmgiCiAjaW5jbHVkZSAiQ1NTTXV0YWJsZVN0eWxlRGVjbGFy YXRpb24uaCIKICNpbmNsdWRlICJEYXRlRXh0ZW5zaW9uLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRM b2FkZXIuaCIKQEAgLTcwLDYgKzcxLDcgQEAKICNpbmNsdWRlIDx2OC5oPgogI2luY2x1ZGUgPHd0 Zi9Bc3NlcnRpb25zLmg+CiAjaW5jbHVkZSA8d3RmL093bkFycmF5UHRyLmg+CisjaW5jbHVkZSA8 d3RmL093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KICNpbmNsdWRlIDx3 dGYvU3RyaW5nRXh0cmFzLmg+CiAjaW5jbHVkZSA8d3RmL1VudXNlZFBhcmFtLmg+CkBAIC0yMzMs MTMgKzIzNSwxMyBAQCBWOFByb3h5Ojp+VjhQcm94eSgpCiAgICAgd2luZG93U2hlbGwoKS0+ZGVz dHJveUdsb2JhbCgpOwogfQogCi12ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IFY4UHJveHk6OmNvbXBp bGVTY3JpcHQodjg6OkhhbmRsZTx2ODo6U3RyaW5nPiBjb2RlLCBjb25zdCBTdHJpbmcmIGZpbGVO YW1lLCBpbnQgYmFzZUxpbmUpCit2ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IFY4UHJveHk6OmNvbXBp bGVTY3JpcHQodjg6OkhhbmRsZTx2ODo6U3RyaW5nPiBjb2RlLCBjb25zdCBTdHJpbmcmIGZpbGVO YW1lLCBpbnQgYmFzZUxpbmUsIHY4OjpTY3JpcHREYXRhKiBzY3JpcHREYXRhKQogewogICAgIGNv bnN0IHVpbnQxNl90KiBmaWxlTmFtZVN0cmluZyA9IGZyb21XZWJDb3JlU3RyaW5nKGZpbGVOYW1l KTsKICAgICB2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IG5hbWUgPSB2ODo6U3RyaW5nOjpOZXcoZmls ZU5hbWVTdHJpbmcsIGZpbGVOYW1lLmxlbmd0aCgpKTsKICAgICB2ODo6SGFuZGxlPHY4OjpJbnRl Z2VyPiBsaW5lID0gdjg6OkludGVnZXI6Ok5ldyhiYXNlTGluZSk7CiAgICAgdjg6OlNjcmlwdE9y aWdpbiBvcmlnaW4obmFtZSwgbGluZSk7Ci0gICAgdjg6OkhhbmRsZTx2ODo6U2NyaXB0PiBzY3Jp cHQgPSB2ODo6U2NyaXB0OjpDb21waWxlKGNvZGUsICZvcmlnaW4pOworICAgIHY4OjpIYW5kbGU8 djg6OlNjcmlwdD4gc2NyaXB0ID0gdjg6OlNjcmlwdDo6Q29tcGlsZShjb2RlLCAmb3JpZ2luLCBz Y3JpcHREYXRhKTsKICAgICByZXR1cm4gc2NyaXB0OwogfQogCkBAIC0zMzgsNiArMzQwLDMzIEBA IGJvb2wgVjhQcm94eTo6c2V0SW5qZWN0ZWRTY3JpcHRDb250ZXh0RGVidWdJZCh2ODo6SGFuZGxl PHY4OjpDb250ZXh0PiB0YXJnZXRDb250CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK1Bhc3NPd25Q dHI8djg6OlNjcmlwdERhdGE+IFY4UHJveHk6OnByZWNvbXBpbGVTY3JpcHQoY29uc3QgU2NyaXB0 U291cmNlQ29kZSYgc291cmNlKQoreworICAgIC8vIEEgcHNldWRvLXJhbmRvbWx5IGNob3NlbiBJ RCB1c2VkIHRvIHN0b3JlIGFuZCByZXRyaWV2ZSBWOCBTY3JpcHREYXRhIGZyb20KKyAgICAvLyB0 aGUgQ2FjaGVkU2NyaXB0LiBJZiB0aGUgZm9ybWF0IGNoYW5nZXMsIHRoaXMgSUQgc2hvdWxkIGJl IGNoYW5nZWQgdG9vLgorICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBkYXRhVHlwZUlEID0gMHhF Q0MxM0JENzsKKworICAgIC8vIFZlcnkgc21hbGwgc2NyaXB0cyBhcmUgbm90IHdvcnRoIHRoZSBl ZmZvcnQgdG8gcHJlcGFyc2UuCisgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIG1pblByZXBhcnNl TGVuZ3RoID0gMTAyNDsKKworICAgIENhY2hlZFNjcmlwdCogY2FjaGVkU2NyaXB0ID0gc291cmNl LmNhY2hlZFNjcmlwdCgpOworICAgIGlmICghY2FjaGVkU2NyaXB0KQorICAgICAgICByZXR1cm4g MDsKKworICAgIENhY2hlZE1ldGFkYXRhKiBjYWNoZWRNZXRhZGF0YSA9IGNhY2hlZFNjcmlwdC0+ Y2FjaGVkTWV0YWRhdGEoZGF0YVR5cGVJRCk7CisgICAgaWYgKGNhY2hlZE1ldGFkYXRhKQorICAg ICAgICByZXR1cm4gdjg6OlNjcmlwdERhdGE6Ok5ldyhjYWNoZWRNZXRhZGF0YS0+ZGF0YSgpLCBj YWNoZWRNZXRhZGF0YS0+c2l6ZSgpKTsKKworICAgIGNvbnN0IENTdHJpbmcmIHV0ZjhTb3VyY2Ug PSBzb3VyY2Uuc291cmNlKCkudXRmOCgpOworICAgIGlmICh1dGY4U291cmNlLmxlbmd0aCgpIDwg bWluUHJlcGFyc2VMZW5ndGgpCisgICAgICAgIHJldHVybiAwOworCisgICAgdjg6OlNjcmlwdERh dGEqIHNjcmlwdERhdGEgPSB2ODo6U2NyaXB0RGF0YTo6UHJlQ29tcGlsZSh1dGY4U291cmNlLmRh dGEoKSwgdXRmOFNvdXJjZS5sZW5ndGgoKSk7CisgICAgY2FjaGVkU2NyaXB0LT5zZXRDYWNoZWRN ZXRhZGF0YShkYXRhVHlwZUlELCBzY3JpcHREYXRhLT5EYXRhKCksIHNjcmlwdERhdGEtPkxlbmd0 aCgpKTsKKworICAgIHJldHVybiBzY3JpcHREYXRhOworfQorCiB2ODo6TG9jYWw8djg6OlZhbHVl PiBWOFByb3h5OjpldmFsdWF0ZShjb25zdCBTY3JpcHRTb3VyY2VDb2RlJiBzb3VyY2UsIE5vZGUq IG5vZGUpCiB7CiAgICAgQVNTRVJUKHY4OjpDb250ZXh0OjpJbkNvbnRleHQoKSk7CkBAIC0zNjMs MTAgKzM5MiwxMSBAQCB2ODo6TG9jYWw8djg6OlZhbHVlPiBWOFByb3h5OjpldmFsdWF0ZShjb25z dCBTY3JpcHRTb3VyY2VDb2RlJiBzb3VyY2UsIE5vZGUqIG5vZAogI2lmIFBMQVRGT1JNKENIUk9N SVVNKQogICAgICAgICBQbGF0Zm9ybUJyaWRnZTo6dHJhY2VFdmVudEJlZ2luKCJ2OC5jb21waWxl Iiwgbm9kZSwgIiIpOwogI2VuZGlmCisgICAgICAgIE93blB0cjx2ODo6U2NyaXB0RGF0YT4gc2Ny aXB0RGF0YSA9IHByZWNvbXBpbGVTY3JpcHQoc291cmNlKTsKIAogICAgICAgICAvLyBOT1RFOiBG b3IgY29tcGF0aWJpbGl0eSB3aXRoIFdlYkNvcmUsIFNjcmlwdFNvdXJjZUNvZGUncyBsaW5lIHN0 YXJ0cyBhdAogICAgICAgICAvLyAxLCB3aGVyZWFzIHY4IHN0YXJ0cyBhdCAwLgotICAgICAgICB2 ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IHNjcmlwdCA9IGNvbXBpbGVTY3JpcHQoY29kZSwgc291cmNl LnVybCgpLCBzb3VyY2Uuc3RhcnRMaW5lKCkgLSAxKTsKKyAgICAgICAgdjg6OkhhbmRsZTx2ODo6 U2NyaXB0PiBzY3JpcHQgPSBjb21waWxlU2NyaXB0KGNvZGUsIHNvdXJjZS51cmwoKSwgc291cmNl LnN0YXJ0TGluZSgpIC0gMSwgc2NyaXB0RGF0YS5nZXQoKSk7CiAjaWYgUExBVEZPUk0oQ0hST01J VU0pCiAgICAgICAgIFBsYXRmb3JtQnJpZGdlOjp0cmFjZUV2ZW50RW5kKCJ2OC5jb21waWxlIiwg bm9kZSwgIiIpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuaCBi L1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCmluZGV4IDA5OGQ5NTZlMmM2MjBkNzE1NGM2 MmUyZWU2ZDRhNTMzMmEzMGMyMDQuLjU5MmEyMjZmMGNiNTBhNDVmNDgyMzE0MmVjYWY1ZWI2ZWMx Y2U5N2EgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCisrKyBiL1dl YkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCkBAIC0yODUsNyArMjg1LDcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogCiAgICAgICAgIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gY2hlY2tO ZXdMZWdhbChjb25zdCB2ODo6QXJndW1lbnRzJik7CiAKLSAgICAgICAgc3RhdGljIHY4OjpIYW5k bGU8djg6OlNjcmlwdD4gY29tcGlsZVNjcmlwdCh2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGNvZGUs IGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGludCBiYXNlTGluZSk7CisgICAgICAgIHN0YXRpYyB2 ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IGNvbXBpbGVTY3JpcHQodjg6OkhhbmRsZTx2ODo6U3RyaW5n PiBjb2RlLCBjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBpbnQgYmFzZUxpbmUsIHY4OjpTY3JpcHRE YXRhKiBzY3JpcHREYXRhID0gMCk7CiAKICAgICAgICAgLy8gSWYgdGhlIGV4Y2VwdGlvbiBjb2Rl IGlzIGRpZmZlcmVudCBmcm9tIHplcm8sIGEgRE9NIGV4Y2VwdGlvbiBpcwogICAgICAgICAvLyBz Y2hlZHVsZSB0byBiZSB0aHJvd24uCkBAIC0zMzcsNiArMzM3LDggQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogCiAgICAgICAgIHZvaWQgcmVzZXRJc29sYXRlZFdvcmxkcygpOwogCisgICAgICAgIFBh c3NPd25QdHI8djg6OlNjcmlwdERhdGE+IHByZWNvbXBpbGVTY3JpcHQoY29uc3QgU2NyaXB0U291 cmNlQ29kZSYgc291cmNlKTsKKwogICAgICAgICAvLyBSZXR1cm5zIGZhbHNlIHdoZW4gd2UncmUg b3V0IG9mIG1lbW9yeSBpbiBWOC4KICAgICAgICAgYm9vbCBzZXRJbmplY3RlZFNjcmlwdENvbnRl eHREZWJ1Z0lkKHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IHRhcmdldENvbnRleHQpOwogCg== 58694 2010-06-14 13:30:05 -0700 2010-06-15 12:53:50 -0700 Patch bug-38661-20100614133004.patch text/plain 11211 tonyg ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4YTcyYTUzYzZiMGVmZDFkMDM2NmM2MTkyNGE3MjdjZjc3ZjViZDE0Li42YjFjOTg5 YzEzNjQ5ZjU4NTA5NTg1ZTJkNTgwODNjMGRkYzVlMGZjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTAtMDYtMTQgIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQZXJzaXN0IFY4J3Mg U2NyaXB0RGF0YSB0byB0aGUgbWVtb3J5IGNhY2hlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg2NjEKKworICAgICAgICBXaGVuIFY4IFNjcmlwdERh dGEgY2FjaGluZyB3YXMgb3JpZ2luYWxseSBzdWJtaXR0ZWQgaXQgY2F1c2VzIGNyYXNoZXMKKyAg ICAgICAgaW4gZXh0ZXJuYWwgc2NyaXB0cyB3aXRoIGhpZ2gtYnl0ZSBjaGFyYWN0ZXJzLiBUaGlz IG5ldyB0ZXN0IGNyYXNoZXMgb24KKyAgICAgICAgdGhlIG9yaWdpbmFsIGNvZGUsIGJ1dCBub3cg cGFzc2VzLgorCisgICAgICAgICogZmFzdC9qcy9wYXJzZXItaGlnaC1ieXRlLWNoYXJhY3Rlci1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvanMvcGFyc2VyLWhpZ2gtYnl0ZS1j aGFyYWN0ZXIuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9qcy9zY3JpcHQtdGVzdHMvcGFy c2VyLWhpZ2gtYnl0ZS1jaGFyYWN0ZXIuanM6IEFkZGVkLgorICAgICAgICAocnVuVGVzdCk6CisK IDIwMTAtMDYtMTQgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAg ICAgICBVbnJldmlld2VkLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9wYXJzZXIt aGlnaC1ieXRlLWNoYXJhY3Rlci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2pzL3Bh cnNlci1oaWdoLWJ5dGUtY2hhcmFjdGVyLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wYWQ3ZDBl YTQxZjFlZmJhYjI1YzZlODM5ZmQ5NzRkNGM5NjBiYmY4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9qcy9wYXJzZXItaGlnaC1ieXRlLWNoYXJhY3Rlci1leHBlY3RlZC50eHQK QEAgLTAsMCArMSw5IEBACitUaGlzIHRlc3QgY2hlY2tzIHRoYXQgaGlnaC1ieXRlIGNoYXJhY3Rl cnMgaW4gY29tbWVudHMgZG8gbm90IGNyYXNoIG9yIGNhdXNlIHBhcnNlciBlcnJvcnMuCisKK09u IHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxv d2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0 cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9w YXJzZXItaGlnaC1ieXRlLWNoYXJhY3Rlci5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9qcy9wYXJz ZXItaGlnaC1ieXRlLWNoYXJhY3Rlci5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmY4M2U5ODNkMmE3MDNmZmIw YWQwYmQwM2E5NDk1Y2VhZTY0YjIwMjAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2pzL3BhcnNlci1oaWdoLWJ5dGUtY2hhcmFjdGVyLmh0bWwKQEAgLTAsMCArMSwxNCBAQAor PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8 aGVhZD4KKzxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9odG1s OyBjaGFyc2V0PXV0Zi04IiAvPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJyZXNvdXJj ZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9InJlc291cmNlcy9qcy10ZXN0LXBy ZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9w PgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0IHNyYz0ic2NyaXB0LXRlc3RzL3Bh cnNlci1oaWdoLWJ5dGUtY2hhcmFjdGVyLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSJyZXNv dXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvanMvc2NyaXB0LXRlc3RzL3BhcnNlci1oaWdoLWJ5dGUt Y2hhcmFjdGVyLmpzIGIvTGF5b3V0VGVzdHMvZmFzdC9qcy9zY3JpcHQtdGVzdHMvcGFyc2VyLWhp Z2gtYnl0ZS1jaGFyYWN0ZXIuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGY1YjU5Yjg5NTY3NDZlNWM5NWI3ZDVk OGQ1ZTlkZjQwYTdmYTVlYgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvanMv c2NyaXB0LXRlc3RzL3BhcnNlci1oaWdoLWJ5dGUtY2hhcmFjdGVyLmpzCkBAIC0wLDAgKzEsMjcg QEAKK2Rlc2NyaXB0aW9uKA0KKyJUaGlzIHRlc3QgY2hlY2tzIHRoYXQgaGlnaC1ieXRlIGNoYXJh Y3RlcnMgaW4gY29tbWVudHMgZG8gbm90IGNyYXNoIG9yIGNhdXNlIHBhcnNlciBlcnJvcnMuIg0K Kyk7DQorDQorLy8gU29tZSBoaWdoLWJ5dGUgY2hhcmFjdGVyczoguLTRobvysru4tNGhy/nT0LXE wdCx7bbg0aG/8g0KK2Z1bmN0aW9uIHJ1blRlc3QoX2EsIHRocm93cykNCit7DQorICAgIHRlc3RQ YXNzZWQoKTsNCit9DQorDQorLyoNCitPdmVyIDEwMjQgYnl0ZXMgdG8gZW5zdXJlIHByZWNvbXBp bGF0aW9uIGNhY2hpbmcgaXMgdHJpZ2dlcmVkLg0KK1hYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFgNCitYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYDQorWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWA0KK1hY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFgNCitYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYDQorWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWA0KK1hYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFgNCitYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYDQor WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWA0KK1hYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFgNCitYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFgNCisqLw0KKw0KK3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOw0KKw0KZGlmZiAtLWdp dCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGU2MzhhOWU1 OTEzYTQ5YTgwYzY4N2UxYjBlNjQ3YzFhNGUzZDFlMC4uNzM0YmM4Zjg5YjIwOTI5NGRhYzMyYWQ4 YzY1OWM4ZGExMmY4NjM5ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMC0wNi0xNCAgVG9ueSBHZW50aWxj b3JlICA8dG9ueWdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFBlcnNpc3QgVjgncyBTY3JpcHREYXRhIHRvIHRoZSBtZW1vcnkg Y2FjaGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z ODY2MQorCisgICAgICAgIFRoaXMgc3RvcmVzIFY4J3MgU2NyaXB0RGF0YSBpbiB0aGUgbWVtb3J5 IGNhY2hlIGFuZCBhbHNvIGNhdXNlcyB0aGUKKyAgICAgICAgbmV0d29yayBwbGF0Zm9ybSBsYXll ciB0byBiZSBub3RpZmllZCBvZiB0aGUgYXZhaWxhYmxlIGNhY2hlYWJsZQorICAgICAgICBtZXRh ZGF0YS4KKworICAgICAgICBDaHJvbWl1bSdzIG1vcmVqcyBiZW5jaG1hcmsgc2hvd2VkIGEgfjcl IGltcHJvdmVtZW50IHdoZW4gdGhpcyB3YXMKKyAgICAgICAgb3JpZ2luYWxseSBzdWJtaXR0ZWQg KGJlZm9yZSBpdCBoYWQgdG8gYmUgcm9sbGVkIGJhY2suCisKKyAgICAgICAgVGVzdDogZmFzdC9q cy9wYXJzZXItaGlnaC1ieXRlLWNoYXJhY3Rlci5odG1sCisKKyAgICAgICAgKiBiaW5kaW5ncy92 OC9TY3JpcHRTb3VyY2VDb2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRTb3VyY2VDb2Rl OjpTY3JpcHRTb3VyY2VDb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdFNvdXJjZUNvZGU6 OmNhY2hlZFNjcmlwdCk6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhQcm94eS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpWOFByb3h5Ojpjb21waWxlU2NyaXB0KToKKyAgICAgICAgKFdlYkNvcmU6 OlY4UHJveHk6OnByZWNvbXBpbGVTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6VjhQcm94eTo6 ZXZhbHVhdGUpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJveHkuaDoKKwogMjAxMC0wNi0x NCAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBtaXNzaW5nIGNv bW1hIHRvIGZpeCBHVEsgYnVpbGQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Nj cmlwdFNvdXJjZUNvZGUuaCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0U291cmNlQ29kZS5o CmluZGV4IDVjMTYxNjhlNDFmMDZiNDI2MWRlNGE5NzBkZTZkZTFhNTY0YzcyNjIuLmRiYzlkNWU2 ZmM2MDA3ZmNmZGQ2NjAyNGRiMDc4MjZjNjYyNjNiNWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmlu ZGluZ3MvdjgvU2NyaXB0U291cmNlQ29kZS5oCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2Ny aXB0U291cmNlQ29kZS5oCkBAIC0zMSw2ICszMSw3IEBACiAjaWZuZGVmIFNjcmlwdFNvdXJjZUNv ZGVfaAogI2RlZmluZSBTY3JpcHRTb3VyY2VDb2RlX2gKIAorI2luY2x1ZGUgIkNhY2hlZFJlc291 cmNlSGFuZGxlLmgiCiAjaW5jbHVkZSAiQ2FjaGVkU2NyaXB0LmgiCiAjaW5jbHVkZSAiS1VSTC5o IgogI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCkBAIC00MSw2ICs0Miw3IEBAIGNsYXNzIFNj cmlwdFNvdXJjZUNvZGUgewogcHVibGljOgogICAgIFNjcmlwdFNvdXJjZUNvZGUoY29uc3QgU3Ry aW5nJiBzb3VyY2UsIGNvbnN0IEtVUkwmIHVybCA9IEtVUkwoKSwgaW50IHN0YXJ0TGluZSA9IDEp CiAgICAgICAgIDogbV9zb3VyY2Uoc291cmNlKQorICAgICAgICAsIG1fY2FjaGVkU2NyaXB0KDAp CiAgICAgICAgICwgbV91cmwodXJsKQogICAgICAgICAsIG1fc3RhcnRMaW5lKHN0YXJ0TGluZSkK ICAgICB7CkBAIC01MCw2ICs1Miw3IEBAIHB1YmxpYzoKICAgICAvLyBOb3Qgc3VyZSBpZiB0aGF0 IG1hdHRlcnMuCiAgICAgU2NyaXB0U291cmNlQ29kZShDYWNoZWRTY3JpcHQqIGNzKQogICAgICAg ICA6IG1fc291cmNlKGNzLT5zY3JpcHQoKSkKKyAgICAgICAgLCBtX2NhY2hlZFNjcmlwdChjcykK ICAgICAgICAgLCBtX3VybChQYXJzZWRVUkxTdHJpbmcsIGNzLT51cmwoKSkKICAgICAgICAgLCBt X3N0YXJ0TGluZSgxKQogICAgIHsKQEAgLTU4LDExICs2MSwxMyBAQCBwdWJsaWM6CiAgICAgYm9v bCBpc0VtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9zb3VyY2UuaXNFbXB0eSgpOyB9CiAKICAgICBj b25zdCBTdHJpbmcmIHNvdXJjZSgpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlOyB9CisgICAgQ2Fj aGVkU2NyaXB0KiBjYWNoZWRTY3JpcHQoKSBjb25zdCB7IHJldHVybiBtX2NhY2hlZFNjcmlwdC5n ZXQoKTsgfQogICAgIGNvbnN0IEtVUkwmIHVybCgpIGNvbnN0IHsgcmV0dXJuIG1fdXJsOyB9CiAg ICAgaW50IHN0YXJ0TGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3RhcnRMaW5lOyB9CiAKIHByaXZh dGU6CiAgICAgU3RyaW5nIG1fc291cmNlOworICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hl ZFNjcmlwdD4gbV9jYWNoZWRTY3JpcHQ7CiAgICAgS1VSTCBtX3VybDsKICAgICBpbnQgbV9zdGFy dExpbmU7CiB9OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcCBi L1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAKaW5kZXggOTA2ZDJiNTBjNTZiZDUwMTdl MzUyYTczN2E1ZGE3YWRkYTVmYTA1My4uNWUxYjI1ZGNhZGU1Zjc0MDUwNmIyYjczZjRmODNlOTE3 ZTU0MjMwNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAorKysg Yi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCkBAIC0zMSw2ICszMSw3IEBACiAjaW5j bHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiVjhQcm94eS5oIgogCisjaW5jbHVkZSAiQ2FjaGVk TWV0YWRhdGEuaCIKICNpbmNsdWRlICJDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5oIgogI2lu Y2x1ZGUgIkRhdGVFeHRlbnNpb24uaCIKICNpbmNsdWRlICJEb2N1bWVudExvYWRlci5oIgpAQCAt NjksNiArNzAsNyBAQAogI2luY2x1ZGUgPHV0aWxpdHk+CiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlv bnMuaD4KICNpbmNsdWRlIDx3dGYvT3duQXJyYXlQdHIuaD4KKyNpbmNsdWRlIDx3dGYvT3duUHRy Lmg+CiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogI2luY2x1ZGUgPHd0Zi9TdHJpbmdF eHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvVW51c2VkUGFyYW0uaD4KQEAgLTIzMiwxMyArMjM0LDEz IEBAIFY4UHJveHk6On5WOFByb3h5KCkKICAgICB3aW5kb3dTaGVsbCgpLT5kZXN0cm95R2xvYmFs KCk7CiB9CiAKLXY4OjpIYW5kbGU8djg6OlNjcmlwdD4gVjhQcm94eTo6Y29tcGlsZVNjcmlwdCh2 ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGNvZGUsIGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGludCBi YXNlTGluZSkKK3Y4OjpIYW5kbGU8djg6OlNjcmlwdD4gVjhQcm94eTo6Y29tcGlsZVNjcmlwdCh2 ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGNvZGUsIGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGludCBi YXNlTGluZSwgdjg6OlNjcmlwdERhdGEqIHNjcmlwdERhdGEpCiB7CiAgICAgY29uc3QgdWludDE2 X3QqIGZpbGVOYW1lU3RyaW5nID0gZnJvbVdlYkNvcmVTdHJpbmcoZmlsZU5hbWUpOwogICAgIHY4 OjpIYW5kbGU8djg6OlN0cmluZz4gbmFtZSA9IHY4OjpTdHJpbmc6Ok5ldyhmaWxlTmFtZVN0cmlu ZywgZmlsZU5hbWUubGVuZ3RoKCkpOwogICAgIHY4OjpIYW5kbGU8djg6OkludGVnZXI+IGxpbmUg PSB2ODo6SW50ZWdlcjo6TmV3KGJhc2VMaW5lKTsKICAgICB2ODo6U2NyaXB0T3JpZ2luIG9yaWdp bihuYW1lLCBsaW5lKTsKLSAgICB2ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IHNjcmlwdCA9IHY4OjpT Y3JpcHQ6OkNvbXBpbGUoY29kZSwgJm9yaWdpbik7CisgICAgdjg6OkhhbmRsZTx2ODo6U2NyaXB0 PiBzY3JpcHQgPSB2ODo6U2NyaXB0OjpDb21waWxlKGNvZGUsICZvcmlnaW4sIHNjcmlwdERhdGEp OwogICAgIHJldHVybiBzY3JpcHQ7CiB9CiAKQEAgLTMzNyw2ICszMzksMjggQEAgYm9vbCBWOFBy b3h5OjpzZXRJbmplY3RlZFNjcmlwdENvbnRleHREZWJ1Z0lkKHY4OjpIYW5kbGU8djg6OkNvbnRl eHQ+IHRhcmdldENvbnQKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorUGFzc093blB0cjx2ODo6U2Ny aXB0RGF0YT4gVjhQcm94eTo6cHJlY29tcGlsZVNjcmlwdCh2ODo6SGFuZGxlPHY4OjpTdHJpbmc+ IGNvZGUsIENhY2hlZFNjcmlwdCogY2FjaGVkU2NyaXB0KQoreworICAgIC8vIEEgcHNldWRvLXJh bmRvbWx5IGNob3NlbiBJRCB1c2VkIHRvIHN0b3JlIGFuZCByZXRyaWV2ZSBWOCBTY3JpcHREYXRh IGZyb20KKyAgICAvLyB0aGUgQ2FjaGVkU2NyaXB0LiBJZiB0aGUgZm9ybWF0IGNoYW5nZXMsIHRo aXMgSUQgc2hvdWxkIGJlIGNoYW5nZWQgdG9vLgorICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBk YXRhVHlwZUlEID0gMHhFQ0MxM0JENzsKKworICAgIC8vIFZlcnkgc21hbGwgc2NyaXB0cyBhcmUg bm90IHdvcnRoIHRoZSBlZmZvcnQgdG8gcHJlcGFyc2UuCisgICAgc3RhdGljIGNvbnN0IHVuc2ln bmVkIG1pblByZXBhcnNlTGVuZ3RoID0gMTAyNDsKKworICAgIGlmICghY2FjaGVkU2NyaXB0IHx8 IGNvZGUtPkxlbmd0aCgpIDwgbWluUHJlcGFyc2VMZW5ndGgpCisgICAgICAgIHJldHVybiAwOwor CisgICAgQ2FjaGVkTWV0YWRhdGEqIGNhY2hlZE1ldGFkYXRhID0gY2FjaGVkU2NyaXB0LT5jYWNo ZWRNZXRhZGF0YShkYXRhVHlwZUlEKTsKKyAgICBpZiAoY2FjaGVkTWV0YWRhdGEpCisgICAgICAg IHJldHVybiB2ODo6U2NyaXB0RGF0YTo6TmV3KGNhY2hlZE1ldGFkYXRhLT5kYXRhKCksIGNhY2hl ZE1ldGFkYXRhLT5zaXplKCkpOworCisgICAgdjg6OlNjcmlwdERhdGEqIHNjcmlwdERhdGEgPSB2 ODo6U2NyaXB0RGF0YTo6UHJlQ29tcGlsZShjb2RlKTsKKyAgICBjYWNoZWRTY3JpcHQtPnNldENh Y2hlZE1ldGFkYXRhKGRhdGFUeXBlSUQsIHNjcmlwdERhdGEtPkRhdGEoKSwgc2NyaXB0RGF0YS0+ TGVuZ3RoKCkpOworCisgICAgcmV0dXJuIHNjcmlwdERhdGE7Cit9CisKIHY4OjpMb2NhbDx2ODo6 VmFsdWU+IFY4UHJveHk6OmV2YWx1YXRlKGNvbnN0IFNjcmlwdFNvdXJjZUNvZGUmIHNvdXJjZSwg Tm9kZSogbm9kZSkKIHsKICAgICBBU1NFUlQodjg6OkNvbnRleHQ6OkluQ29udGV4dCgpKTsKQEAg LTM2MiwxMCArMzg2LDExIEBAIHY4OjpMb2NhbDx2ODo6VmFsdWU+IFY4UHJveHk6OmV2YWx1YXRl KGNvbnN0IFNjcmlwdFNvdXJjZUNvZGUmIHNvdXJjZSwgTm9kZSogbm9kCiAjaWYgUExBVEZPUk0o Q0hST01JVU0pCiAgICAgICAgIFBsYXRmb3JtQnJpZGdlOjp0cmFjZUV2ZW50QmVnaW4oInY4LmNv bXBpbGUiLCBub2RlLCAiIik7CiAjZW5kaWYKKyAgICAgICAgT3duUHRyPHY4OjpTY3JpcHREYXRh PiBzY3JpcHREYXRhID0gcHJlY29tcGlsZVNjcmlwdChjb2RlLCBzb3VyY2UuY2FjaGVkU2NyaXB0 KCkpOwogCiAgICAgICAgIC8vIE5PVEU6IEZvciBjb21wYXRpYmlsaXR5IHdpdGggV2ViQ29yZSwg U2NyaXB0U291cmNlQ29kZSdzIGxpbmUgc3RhcnRzIGF0CiAgICAgICAgIC8vIDEsIHdoZXJlYXMg djggc3RhcnRzIGF0IDAuCi0gICAgICAgIHY4OjpIYW5kbGU8djg6OlNjcmlwdD4gc2NyaXB0ID0g Y29tcGlsZVNjcmlwdChjb2RlLCBzb3VyY2UudXJsKCksIHNvdXJjZS5zdGFydExpbmUoKSAtIDEp OworICAgICAgICB2ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IHNjcmlwdCA9IGNvbXBpbGVTY3JpcHQo Y29kZSwgc291cmNlLnVybCgpLCBzb3VyY2Uuc3RhcnRMaW5lKCkgLSAxLCBzY3JpcHREYXRhLmdl dCgpKTsKICNpZiBQTEFURk9STShDSFJPTUlVTSkKICAgICAgICAgUGxhdGZvcm1CcmlkZ2U6OnRy YWNlRXZlbnRFbmQoInY4LmNvbXBpbGUiLCBub2RlLCAiIik7CiAKZGlmZiAtLWdpdCBhL1dlYkNv cmUvYmluZGluZ3MvdjgvVjhQcm94eS5oIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgK aW5kZXggMDk4ZDk1NmUyYzYyMGQ3MTU0YzYyZTJlZTZkNGE1MzMyYTMwYzIwNC4uNmU1ZmU1Y2Ux MGIwNjNmOGVkMWE4NjZiMDkyYTVkMjVmNmZkOTg1OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5k aW5ncy92OC9WOFByb3h5LmgKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgKQEAg LTUzLDYgKzUzLDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCisgICAgY2xhc3MgQ2FjaGVk U2NyaXB0OwogICAgIGNsYXNzIERPTVdpbmRvdzsKICAgICBjbGFzcyBGcmFtZTsKICAgICBjbGFz cyBOb2RlOwpAQCAtMjg1LDcgKzI4Niw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAg ICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGNoZWNrTmV3TGVnYWwoY29uc3Qgdjg6OkFy Z3VtZW50cyYpOwogCi0gICAgICAgIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IGNvbXBp bGVTY3JpcHQodjg6OkhhbmRsZTx2ODo6U3RyaW5nPiBjb2RlLCBjb25zdCBTdHJpbmcmIGZpbGVO YW1lLCBpbnQgYmFzZUxpbmUpOworICAgICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6U2NyaXB0 PiBjb21waWxlU2NyaXB0KHY4OjpIYW5kbGU8djg6OlN0cmluZz4gY29kZSwgY29uc3QgU3RyaW5n JiBmaWxlTmFtZSwgaW50IGJhc2VMaW5lLCB2ODo6U2NyaXB0RGF0YSogc2NyaXB0RGF0YSA9IDAp OwogCiAgICAgICAgIC8vIElmIHRoZSBleGNlcHRpb24gY29kZSBpcyBkaWZmZXJlbnQgZnJvbSB6 ZXJvLCBhIERPTSBleGNlcHRpb24gaXMKICAgICAgICAgLy8gc2NoZWR1bGUgdG8gYmUgdGhyb3du LgpAQCAtMzM3LDYgKzMzOCw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2b2lk IHJlc2V0SXNvbGF0ZWRXb3JsZHMoKTsKIAorICAgICAgICBQYXNzT3duUHRyPHY4OjpTY3JpcHRE YXRhPiBwcmVjb21waWxlU2NyaXB0KHY4OjpIYW5kbGU8djg6OlN0cmluZz4sIENhY2hlZFNjcmlw dCopOworCiAgICAgICAgIC8vIFJldHVybnMgZmFsc2Ugd2hlbiB3ZSdyZSBvdXQgb2YgbWVtb3J5 IGluIFY4LgogICAgICAgICBib29sIHNldEluamVjdGVkU2NyaXB0Q29udGV4dERlYnVnSWQodjg6 OkhhbmRsZTx2ODo6Q29udGV4dD4gdGFyZ2V0Q29udGV4dCk7CiAK 58809 2010-06-15 12:53:57 -0700 2010-06-18 09:21:47 -0700 Patch bug-38661-20100615125355.patch text/plain 11216 tonyg ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiYTVkNDExNDE2NGQyYmUwMjVlMDNiY2VmOGEwNTU2YzQyM2E0ZGQ0Li43OGFlMTVi Y2I3NzIyOTZjYTE4OGUxNzdiMzQ0YjUxNmFlNTQxMjU4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTAtMDYtMTQgIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQZXJzaXN0IFY4J3Mg U2NyaXB0RGF0YSB0byB0aGUgbWVtb3J5IGNhY2hlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg2NjEKKworICAgICAgICBXaGVuIFY4IFNjcmlwdERh dGEgY2FjaGluZyB3YXMgb3JpZ2luYWxseSBzdWJtaXR0ZWQgaXQgY2F1c2VzIGNyYXNoZXMKKyAg ICAgICAgaW4gZXh0ZXJuYWwgc2NyaXB0cyB3aXRoIGhpZ2gtYnl0ZSBjaGFyYWN0ZXJzLiBUaGlz IG5ldyB0ZXN0IGNyYXNoZXMgb24KKyAgICAgICAgdGhlIG9yaWdpbmFsIGNvZGUsIGJ1dCBub3cg cGFzc2VzLgorCisgICAgICAgICogZmFzdC9qcy9wYXJzZXItaGlnaC1ieXRlLWNoYXJhY3Rlci1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvanMvcGFyc2VyLWhpZ2gtYnl0ZS1j aGFyYWN0ZXIuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9qcy9zY3JpcHQtdGVzdHMvcGFy c2VyLWhpZ2gtYnl0ZS1jaGFyYWN0ZXIuanM6IEFkZGVkLgorICAgICAgICAocnVuVGVzdCk6CisK IDIwMTAtMDYtMTUgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBCcmFkeSBFaWRzb24uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2pzL3BhcnNlci1oaWdoLWJ5dGUtY2hhcmFjdGVyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2Zhc3QvanMvcGFyc2VyLWhpZ2gtYnl0ZS1jaGFyYWN0ZXItZXhwZWN0ZWQudHh0Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjBhZDdkMGVhNDFmMWVmYmFiMjVjNmU4MzlmZDk3NGQ0Yzk2MGJiZjgKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2pzL3BhcnNlci1oaWdoLWJ5dGUtY2hhcmFjdGVyLWV4 cGVjdGVkLnR4dApAQCAtMCwwICsxLDkgQEAKK1RoaXMgdGVzdCBjaGVja3MgdGhhdCBoaWdoLWJ5 dGUgY2hhcmFjdGVycyBpbiBjb21tZW50cyBkbyBub3QgY3Jhc2ggb3IgY2F1c2UgcGFyc2VyIGVy cm9ycy4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNz YWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1Mgc3VjY2Vzc2Z1bGx5 UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2pzL3BhcnNlci1oaWdoLWJ5dGUtY2hhcmFjdGVyLmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L2pzL3BhcnNlci1oaWdoLWJ5dGUtY2hhcmFjdGVyLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjgzZTk4 M2QyYTcwM2ZmYjBhZDBiZDAzYTk0OTVjZWFlNjRiMjAyMAotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvanMvcGFyc2VyLWhpZ2gtYnl0ZS1jaGFyYWN0ZXIuaHRtbApAQCAtMCww ICsxLDE0IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+ Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50 PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgiIC8+Cis8bGluayByZWw9InN0eWxlc2hlZXQiIGhy ZWY9InJlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0IHNyYz0icmVzb3VyY2Vz L2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHAgaWQ9ImRlc2Ny aXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQgc3JjPSJzY3Jp cHQtdGVzdHMvcGFyc2VyLWhpZ2gtYnl0ZS1jaGFyYWN0ZXIuanMiPjwvc2NyaXB0PgorPHNjcmlw dCBzcmM9InJlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9o dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9zY3JpcHQtdGVzdHMvcGFyc2Vy LWhpZ2gtYnl0ZS1jaGFyYWN0ZXIuanMgYi9MYXlvdXRUZXN0cy9mYXN0L2pzL3NjcmlwdC10ZXN0 cy9wYXJzZXItaGlnaC1ieXRlLWNoYXJhY3Rlci5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44ZjViNTliODk1Njc0 NmU1Yzk1YjdkNWQ4ZDVlOWRmNDBhN2ZhNWViCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9qcy9zY3JpcHQtdGVzdHMvcGFyc2VyLWhpZ2gtYnl0ZS1jaGFyYWN0ZXIuanMKQEAg LTAsMCArMSwyNyBAQAorZGVzY3JpcHRpb24oDQorIlRoaXMgdGVzdCBjaGVja3MgdGhhdCBoaWdo LWJ5dGUgY2hhcmFjdGVycyBpbiBjb21tZW50cyBkbyBub3QgY3Jhc2ggb3IgY2F1c2UgcGFyc2Vy IGVycm9ycy4iDQorKTsNCisNCisvLyBTb21lIGhpZ2gtYnl0ZSBjaGFyYWN0ZXJzOiC4tNGhu/Ky u7i00aHL+dPQtcTB0LHttuDRob/yDQorZnVuY3Rpb24gcnVuVGVzdChfYSwgdGhyb3dzKQ0KK3sN CisgICAgdGVzdFBhc3NlZCgpOw0KK30NCisNCisvKg0KK092ZXIgMTAyNCBieXRlcyB0byBlbnN1 cmUgcHJlY29tcGlsYXRpb24gY2FjaGluZyBpcyB0cmlnZ2VyZWQuDQorWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWA0KK1hYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFgNCitYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYDQorWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWA0KK1hY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFgNCitYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYDQorWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWA0KK1hYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFgNCitYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYDQor WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWA0KK1hYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWA0KKyovDQorDQordmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7DQor DQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCAzMzlhNjI3ZWY0YzBmYjcwZDRhYThkNzM1NDVmY2FjNDMxOTcyMGQwLi43YjU3MGNhZWIzMDNi ZjcxNGYxYWQyYzUyMTU0NmI3ODczNDhhMjllIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEwLTA2LTE0ICBU b255IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGVyc2lzdCBWOCdzIFNjcmlwdERhdGEgdG8g dGhlIG1lbW9yeSBjYWNoZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTM4NjYxCisKKyAgICAgICAgVGhpcyBzdG9yZXMgVjgncyBTY3JpcHREYXRhIGlu IHRoZSBtZW1vcnkgY2FjaGUgYW5kIGFsc28gY2F1c2VzIHRoZQorICAgICAgICBuZXR3b3JrIHBs YXRmb3JtIGxheWVyIHRvIGJlIG5vdGlmaWVkIG9mIHRoZSBhdmFpbGFibGUgY2FjaGVhYmxlCisg ICAgICAgIG1ldGFkYXRhLgorCisgICAgICAgIENocm9taXVtJ3MgbW9yZWpzIGJlbmNobWFyayBz aG93ZWQgYSB+NyUgaW1wcm92ZW1lbnQgd2hlbiB0aGlzIHdhcworICAgICAgICBvcmlnaW5hbGx5 IHN1Ym1pdHRlZCAoYmVmb3JlIGl0IGhhZCB0byBiZSByb2xsZWQgYmFjaykuCisKKyAgICAgICAg VGVzdDogZmFzdC9qcy9wYXJzZXItaGlnaC1ieXRlLWNoYXJhY3Rlci5odG1sCisKKyAgICAgICAg KiBiaW5kaW5ncy92OC9TY3JpcHRTb3VyY2VDb2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3Jp cHRTb3VyY2VDb2RlOjpTY3JpcHRTb3VyY2VDb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlw dFNvdXJjZUNvZGU6OmNhY2hlZFNjcmlwdCk6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhQcm94 eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOFByb3h5Ojpjb21waWxlU2NyaXB0KToKKyAgICAg ICAgKFdlYkNvcmU6OlY4UHJveHk6OnByZWNvbXBpbGVTY3JpcHQpOgorICAgICAgICAoV2ViQ29y ZTo6VjhQcm94eTo6ZXZhbHVhdGUpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJveHkuaDoK KwogMjAxMC0wNi0xNSAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAg VHJ5IHRvIGZpeCBHVEsrIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9T Y3JpcHRTb3VyY2VDb2RlLmggYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFNvdXJjZUNvZGUu aAppbmRleCA1YzE2MTY4ZTQxZjA2YjQyNjFkZTRhOTcwZGU2ZGUxYTU2NGM3MjYyLi5kYmM5ZDVl NmZjNjAwN2ZjZmRkNjYwMjRkYjA3ODI2YzY2MjYzYjViIDEwMDY0NAotLS0gYS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L1NjcmlwdFNvdXJjZUNvZGUuaAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Nj cmlwdFNvdXJjZUNvZGUuaApAQCAtMzEsNiArMzEsNyBAQAogI2lmbmRlZiBTY3JpcHRTb3VyY2VD b2RlX2gKICNkZWZpbmUgU2NyaXB0U291cmNlQ29kZV9oCiAKKyNpbmNsdWRlICJDYWNoZWRSZXNv dXJjZUhhbmRsZS5oIgogI2luY2x1ZGUgIkNhY2hlZFNjcmlwdC5oIgogI2luY2x1ZGUgIktVUkwu aCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgpAQCAtNDEsNiArNDIsNyBAQCBjbGFzcyBT Y3JpcHRTb3VyY2VDb2RlIHsKIHB1YmxpYzoKICAgICBTY3JpcHRTb3VyY2VDb2RlKGNvbnN0IFN0 cmluZyYgc291cmNlLCBjb25zdCBLVVJMJiB1cmwgPSBLVVJMKCksIGludCBzdGFydExpbmUgPSAx KQogICAgICAgICA6IG1fc291cmNlKHNvdXJjZSkKKyAgICAgICAgLCBtX2NhY2hlZFNjcmlwdCgw KQogICAgICAgICAsIG1fdXJsKHVybCkKICAgICAgICAgLCBtX3N0YXJ0TGluZShzdGFydExpbmUp CiAgICAgewpAQCAtNTAsNiArNTIsNyBAQCBwdWJsaWM6CiAgICAgLy8gTm90IHN1cmUgaWYgdGhh dCBtYXR0ZXJzLgogICAgIFNjcmlwdFNvdXJjZUNvZGUoQ2FjaGVkU2NyaXB0KiBjcykKICAgICAg ICAgOiBtX3NvdXJjZShjcy0+c2NyaXB0KCkpCisgICAgICAgICwgbV9jYWNoZWRTY3JpcHQoY3Mp CiAgICAgICAgICwgbV91cmwoUGFyc2VkVVJMU3RyaW5nLCBjcy0+dXJsKCkpCiAgICAgICAgICwg bV9zdGFydExpbmUoMSkKICAgICB7CkBAIC01OCwxMSArNjEsMTMgQEAgcHVibGljOgogICAgIGJv b2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlLmlzRW1wdHkoKTsgfQogCiAgICAg Y29uc3QgU3RyaW5nJiBzb3VyY2UoKSBjb25zdCB7IHJldHVybiBtX3NvdXJjZTsgfQorICAgIENh Y2hlZFNjcmlwdCogY2FjaGVkU2NyaXB0KCkgY29uc3QgeyByZXR1cm4gbV9jYWNoZWRTY3JpcHQu Z2V0KCk7IH0KICAgICBjb25zdCBLVVJMJiB1cmwoKSBjb25zdCB7IHJldHVybiBtX3VybDsgfQog ICAgIGludCBzdGFydExpbmUoKSBjb25zdCB7IHJldHVybiBtX3N0YXJ0TGluZTsgfQogCiBwcml2 YXRlOgogICAgIFN0cmluZyBtX3NvdXJjZTsKKyAgICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNo ZWRTY3JpcHQ+IG1fY2FjaGVkU2NyaXB0OwogICAgIEtVUkwgbV91cmw7CiAgICAgaW50IG1fc3Rh cnRMaW5lOwogfTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAg Yi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCmluZGV4IDkwNmQyYjUwYzU2YmQ1MDE3 ZTM1MmE3MzdhNWRhN2FkZGE1ZmEwNTMuLmU3YjI3MDBjN2VmZTBhMmM1Njk2YTY3NjNmNGExMjYz NjQ4YjgyNWMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAKKysr IGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2lu Y2x1ZGUgIlY4UHJveHkuaCIKIAogI2luY2x1ZGUgIkNTU011dGFibGVTdHlsZURlY2xhcmF0aW9u LmgiCisjaW5jbHVkZSAiQ2FjaGVkTWV0YWRhdGEuaCIKICNpbmNsdWRlICJEYXRlRXh0ZW5zaW9u LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRMb2FkZXIuaCIKICNpbmNsdWRlICJGcmFtZS5oIgpAQCAt NjksNiArNzAsNyBAQAogI2luY2x1ZGUgPHV0aWxpdHk+CiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlv bnMuaD4KICNpbmNsdWRlIDx3dGYvT3duQXJyYXlQdHIuaD4KKyNpbmNsdWRlIDx3dGYvT3duUHRy Lmg+CiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogI2luY2x1ZGUgPHd0Zi9TdHJpbmdF eHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvVW51c2VkUGFyYW0uaD4KQEAgLTIzMiwxMyArMjM0LDEz IEBAIFY4UHJveHk6On5WOFByb3h5KCkKICAgICB3aW5kb3dTaGVsbCgpLT5kZXN0cm95R2xvYmFs KCk7CiB9CiAKLXY4OjpIYW5kbGU8djg6OlNjcmlwdD4gVjhQcm94eTo6Y29tcGlsZVNjcmlwdCh2 ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGNvZGUsIGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGludCBi YXNlTGluZSkKK3Y4OjpIYW5kbGU8djg6OlNjcmlwdD4gVjhQcm94eTo6Y29tcGlsZVNjcmlwdCh2 ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGNvZGUsIGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGludCBi YXNlTGluZSwgdjg6OlNjcmlwdERhdGEqIHNjcmlwdERhdGEpCiB7CiAgICAgY29uc3QgdWludDE2 X3QqIGZpbGVOYW1lU3RyaW5nID0gZnJvbVdlYkNvcmVTdHJpbmcoZmlsZU5hbWUpOwogICAgIHY4 OjpIYW5kbGU8djg6OlN0cmluZz4gbmFtZSA9IHY4OjpTdHJpbmc6Ok5ldyhmaWxlTmFtZVN0cmlu ZywgZmlsZU5hbWUubGVuZ3RoKCkpOwogICAgIHY4OjpIYW5kbGU8djg6OkludGVnZXI+IGxpbmUg PSB2ODo6SW50ZWdlcjo6TmV3KGJhc2VMaW5lKTsKICAgICB2ODo6U2NyaXB0T3JpZ2luIG9yaWdp bihuYW1lLCBsaW5lKTsKLSAgICB2ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IHNjcmlwdCA9IHY4OjpT Y3JpcHQ6OkNvbXBpbGUoY29kZSwgJm9yaWdpbik7CisgICAgdjg6OkhhbmRsZTx2ODo6U2NyaXB0 PiBzY3JpcHQgPSB2ODo6U2NyaXB0OjpDb21waWxlKGNvZGUsICZvcmlnaW4sIHNjcmlwdERhdGEp OwogICAgIHJldHVybiBzY3JpcHQ7CiB9CiAKQEAgLTMzNyw2ICszMzksMjggQEAgYm9vbCBWOFBy b3h5OjpzZXRJbmplY3RlZFNjcmlwdENvbnRleHREZWJ1Z0lkKHY4OjpIYW5kbGU8djg6OkNvbnRl eHQ+IHRhcmdldENvbnQKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorUGFzc093blB0cjx2ODo6U2Ny aXB0RGF0YT4gVjhQcm94eTo6cHJlY29tcGlsZVNjcmlwdCh2ODo6SGFuZGxlPHY4OjpTdHJpbmc+ IGNvZGUsIENhY2hlZFNjcmlwdCogY2FjaGVkU2NyaXB0KQoreworICAgIC8vIEEgcHNldWRvLXJh bmRvbWx5IGNob3NlbiBJRCB1c2VkIHRvIHN0b3JlIGFuZCByZXRyaWV2ZSBWOCBTY3JpcHREYXRh IGZyb20KKyAgICAvLyB0aGUgQ2FjaGVkU2NyaXB0LiBJZiB0aGUgZm9ybWF0IGNoYW5nZXMsIHRo aXMgSUQgc2hvdWxkIGJlIGNoYW5nZWQgdG9vLgorICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBk YXRhVHlwZUlEID0gMHhFQ0MxM0JENzsKKworICAgIC8vIFZlcnkgc21hbGwgc2NyaXB0cyBhcmUg bm90IHdvcnRoIHRoZSBlZmZvcnQgdG8gcHJlcGFyc2UuCisgICAgc3RhdGljIGNvbnN0IHVuc2ln bmVkIG1pblByZXBhcnNlTGVuZ3RoID0gMTAyNDsKKworICAgIGlmICghY2FjaGVkU2NyaXB0IHx8 IGNvZGUtPkxlbmd0aCgpIDwgbWluUHJlcGFyc2VMZW5ndGgpCisgICAgICAgIHJldHVybiAwOwor CisgICAgQ2FjaGVkTWV0YWRhdGEqIGNhY2hlZE1ldGFkYXRhID0gY2FjaGVkU2NyaXB0LT5jYWNo ZWRNZXRhZGF0YShkYXRhVHlwZUlEKTsKKyAgICBpZiAoY2FjaGVkTWV0YWRhdGEpCisgICAgICAg IHJldHVybiB2ODo6U2NyaXB0RGF0YTo6TmV3KGNhY2hlZE1ldGFkYXRhLT5kYXRhKCksIGNhY2hl ZE1ldGFkYXRhLT5zaXplKCkpOworCisgICAgT3duUHRyPHY4OjpTY3JpcHREYXRhPiBzY3JpcHRE YXRhKHY4OjpTY3JpcHREYXRhOjpQcmVDb21waWxlKGNvZGUpKTsKKyAgICBjYWNoZWRTY3JpcHQt PnNldENhY2hlZE1ldGFkYXRhKGRhdGFUeXBlSUQsIHNjcmlwdERhdGEtPkRhdGEoKSwgc2NyaXB0 RGF0YS0+TGVuZ3RoKCkpOworCisgICAgcmV0dXJuIHNjcmlwdERhdGEucmVsZWFzZSgpOworfQor CiB2ODo6TG9jYWw8djg6OlZhbHVlPiBWOFByb3h5OjpldmFsdWF0ZShjb25zdCBTY3JpcHRTb3Vy Y2VDb2RlJiBzb3VyY2UsIE5vZGUqIG5vZGUpCiB7CiAgICAgQVNTRVJUKHY4OjpDb250ZXh0OjpJ bkNvbnRleHQoKSk7CkBAIC0zNjIsMTAgKzM4NiwxMSBAQCB2ODo6TG9jYWw8djg6OlZhbHVlPiBW OFByb3h5OjpldmFsdWF0ZShjb25zdCBTY3JpcHRTb3VyY2VDb2RlJiBzb3VyY2UsIE5vZGUqIG5v ZAogI2lmIFBMQVRGT1JNKENIUk9NSVVNKQogICAgICAgICBQbGF0Zm9ybUJyaWRnZTo6dHJhY2VF dmVudEJlZ2luKCJ2OC5jb21waWxlIiwgbm9kZSwgIiIpOwogI2VuZGlmCisgICAgICAgIE93blB0 cjx2ODo6U2NyaXB0RGF0YT4gc2NyaXB0RGF0YSA9IHByZWNvbXBpbGVTY3JpcHQoY29kZSwgc291 cmNlLmNhY2hlZFNjcmlwdCgpKTsKIAogICAgICAgICAvLyBOT1RFOiBGb3IgY29tcGF0aWJpbGl0 eSB3aXRoIFdlYkNvcmUsIFNjcmlwdFNvdXJjZUNvZGUncyBsaW5lIHN0YXJ0cyBhdAogICAgICAg ICAvLyAxLCB3aGVyZWFzIHY4IHN0YXJ0cyBhdCAwLgotICAgICAgICB2ODo6SGFuZGxlPHY4OjpT Y3JpcHQ+IHNjcmlwdCA9IGNvbXBpbGVTY3JpcHQoY29kZSwgc291cmNlLnVybCgpLCBzb3VyY2Uu c3RhcnRMaW5lKCkgLSAxKTsKKyAgICAgICAgdjg6OkhhbmRsZTx2ODo6U2NyaXB0PiBzY3JpcHQg PSBjb21waWxlU2NyaXB0KGNvZGUsIHNvdXJjZS51cmwoKSwgc291cmNlLnN0YXJ0TGluZSgpIC0g MSwgc2NyaXB0RGF0YS5nZXQoKSk7CiAjaWYgUExBVEZPUk0oQ0hST01JVU0pCiAgICAgICAgIFBs YXRmb3JtQnJpZGdlOjp0cmFjZUV2ZW50RW5kKCJ2OC5jb21waWxlIiwgbm9kZSwgIiIpOwogCmRp ZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuaCBiL1dlYkNvcmUvYmluZGlu Z3MvdjgvVjhQcm94eS5oCmluZGV4IDA5OGQ5NTZlMmM2MjBkNzE1NGM2MmUyZWU2ZDRhNTMzMmEz MGMyMDQuLjNiNDBmNjJkNThkMzU5YmFiYzNmMWZkMGE0ZmQyM2Y3NGRhMGU4NTggMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCisrKyBiL1dlYkNvcmUvYmluZGluZ3Mv djgvVjhQcm94eS5oCkBAIC01Myw2ICs1Myw3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAor ICAgIGNsYXNzIENhY2hlZFNjcmlwdDsKICAgICBjbGFzcyBET01XaW5kb3c7CiAgICAgY2xhc3Mg RnJhbWU7CiAgICAgY2xhc3MgTm9kZTsKQEAgLTI4NSw3ICsyODYsNyBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKICAgICAgICAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBjaGVja05ld0xl Z2FsKGNvbnN0IHY4OjpBcmd1bWVudHMmKTsKIAotICAgICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2 ODo6U2NyaXB0PiBjb21waWxlU2NyaXB0KHY4OjpIYW5kbGU8djg6OlN0cmluZz4gY29kZSwgY29u c3QgU3RyaW5nJiBmaWxlTmFtZSwgaW50IGJhc2VMaW5lKTsKKyAgICAgICAgc3RhdGljIHY4OjpI YW5kbGU8djg6OlNjcmlwdD4gY29tcGlsZVNjcmlwdCh2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGNv ZGUsIGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGludCBiYXNlTGluZSwgdjg6OlNjcmlwdERhdGEq ID0gMCk7CiAKICAgICAgICAgLy8gSWYgdGhlIGV4Y2VwdGlvbiBjb2RlIGlzIGRpZmZlcmVudCBm cm9tIHplcm8sIGEgRE9NIGV4Y2VwdGlvbiBpcwogICAgICAgICAvLyBzY2hlZHVsZSB0byBiZSB0 aHJvd24uCkBAIC0zMzcsNiArMzM4LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAg IHZvaWQgcmVzZXRJc29sYXRlZFdvcmxkcygpOwogCisgICAgICAgIFBhc3NPd25QdHI8djg6OlNj cmlwdERhdGE+IHByZWNvbXBpbGVTY3JpcHQodjg6OkhhbmRsZTx2ODo6U3RyaW5nPiwgQ2FjaGVk U2NyaXB0Kik7CisKICAgICAgICAgLy8gUmV0dXJucyBmYWxzZSB3aGVuIHdlJ3JlIG91dCBvZiBt ZW1vcnkgaW4gVjguCiAgICAgICAgIGJvb2wgc2V0SW5qZWN0ZWRTY3JpcHRDb250ZXh0RGVidWdJ ZCh2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiB0YXJnZXRDb250ZXh0KTsKIAo= 59121 2010-06-18 09:21:52 -0700 2010-06-19 17:38:10 -0700 Change minPreparseLength from unsigned to int to fix mac compile bug-38661-20100618092150.patch text/plain 11218 tonyg ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2YWRmZjM0YWFlYjE4M2EzODY0MTIwOWM1NTYxZDE3ZWVkY2JiMTJjLi4xNDlhMDgw OTg2NGIzZTU2NzI4ZmJiZWZmN2Q5MmM4MDI5MWE4NDlmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTAtMDYtMTQgIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQZXJzaXN0IFY4J3Mg U2NyaXB0RGF0YSB0byB0aGUgbWVtb3J5IGNhY2hlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg2NjEKKworICAgICAgICBXaGVuIFY4IFNjcmlwdERh dGEgY2FjaGluZyB3YXMgb3JpZ2luYWxseSBzdWJtaXR0ZWQgaXQgY2F1c2VzIGNyYXNoZXMKKyAg ICAgICAgaW4gZXh0ZXJuYWwgc2NyaXB0cyB3aXRoIGhpZ2gtYnl0ZSBjaGFyYWN0ZXJzLiBUaGlz IG5ldyB0ZXN0IGNyYXNoZXMgb24KKyAgICAgICAgdGhlIG9yaWdpbmFsIGNvZGUsIGJ1dCBub3cg cGFzc2VzLgorCisgICAgICAgICogZmFzdC9qcy9wYXJzZXItaGlnaC1ieXRlLWNoYXJhY3Rlci1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvanMvcGFyc2VyLWhpZ2gtYnl0ZS1j aGFyYWN0ZXIuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9qcy9zY3JpcHQtdGVzdHMvcGFy c2VyLWhpZ2gtYnl0ZS1jaGFyYWN0ZXIuanM6IEFkZGVkLgorICAgICAgICAocnVuVGVzdCk6CisK IDIwMTAtMDYtMTggIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2pzL3BhcnNlci1oaWdoLWJ5dGUtY2hhcmFjdGVyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2Zhc3QvanMvcGFyc2VyLWhpZ2gtYnl0ZS1jaGFyYWN0ZXItZXhwZWN0ZWQudHh0Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjBhZDdkMGVhNDFmMWVmYmFiMjVjNmU4MzlmZDk3NGQ0Yzk2MGJiZjgKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2pzL3BhcnNlci1oaWdoLWJ5dGUtY2hhcmFjdGVyLWV4 cGVjdGVkLnR4dApAQCAtMCwwICsxLDkgQEAKK1RoaXMgdGVzdCBjaGVja3MgdGhhdCBoaWdoLWJ5 dGUgY2hhcmFjdGVycyBpbiBjb21tZW50cyBkbyBub3QgY3Jhc2ggb3IgY2F1c2UgcGFyc2VyIGVy cm9ycy4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNz YWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1Mgc3VjY2Vzc2Z1bGx5 UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2pzL3BhcnNlci1oaWdoLWJ5dGUtY2hhcmFjdGVyLmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L2pzL3BhcnNlci1oaWdoLWJ5dGUtY2hhcmFjdGVyLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjgzZTk4 M2QyYTcwM2ZmYjBhZDBiZDAzYTk0OTVjZWFlNjRiMjAyMAotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvanMvcGFyc2VyLWhpZ2gtYnl0ZS1jaGFyYWN0ZXIuaHRtbApAQCAtMCww ICsxLDE0IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+ Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50 PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgiIC8+Cis8bGluayByZWw9InN0eWxlc2hlZXQiIGhy ZWY9InJlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0IHNyYz0icmVzb3VyY2Vz L2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHAgaWQ9ImRlc2Ny aXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQgc3JjPSJzY3Jp cHQtdGVzdHMvcGFyc2VyLWhpZ2gtYnl0ZS1jaGFyYWN0ZXIuanMiPjwvc2NyaXB0PgorPHNjcmlw dCBzcmM9InJlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9o dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9zY3JpcHQtdGVzdHMvcGFyc2Vy LWhpZ2gtYnl0ZS1jaGFyYWN0ZXIuanMgYi9MYXlvdXRUZXN0cy9mYXN0L2pzL3NjcmlwdC10ZXN0 cy9wYXJzZXItaGlnaC1ieXRlLWNoYXJhY3Rlci5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44ZjViNTliODk1Njc0 NmU1Yzk1YjdkNWQ4ZDVlOWRmNDBhN2ZhNWViCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9qcy9zY3JpcHQtdGVzdHMvcGFyc2VyLWhpZ2gtYnl0ZS1jaGFyYWN0ZXIuanMKQEAg LTAsMCArMSwyNyBAQAorZGVzY3JpcHRpb24oDQorIlRoaXMgdGVzdCBjaGVja3MgdGhhdCBoaWdo LWJ5dGUgY2hhcmFjdGVycyBpbiBjb21tZW50cyBkbyBub3QgY3Jhc2ggb3IgY2F1c2UgcGFyc2Vy IGVycm9ycy4iDQorKTsNCisNCisvLyBTb21lIGhpZ2gtYnl0ZSBjaGFyYWN0ZXJzOiC4tNGhu/Ky u7i00aHL+dPQtcTB0LHttuDRob/yDQorZnVuY3Rpb24gcnVuVGVzdChfYSwgdGhyb3dzKQ0KK3sN CisgICAgdGVzdFBhc3NlZCgpOw0KK30NCisNCisvKg0KK092ZXIgMTAyNCBieXRlcyB0byBlbnN1 cmUgcHJlY29tcGlsYXRpb24gY2FjaGluZyBpcyB0cmlnZ2VyZWQuDQorWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWA0KK1hYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFgNCitYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYDQorWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWA0KK1hY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFgNCitYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYDQorWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWA0KK1hYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFgNCitYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYDQor WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWA0KK1hYWFhYWFhYWFhY WFhYWFhYWFhYWFhYWA0KKyovDQorDQordmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7DQor DQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCAzMjFkODg4ZmY3MjQxODdiOTRhNWI4YTIyNDgzMTg2MTBkNjQ4NmM4Li41ZDU3NmQzNGJjYTgz MjdhMjY5MGIyMTk0NTEyNGM3ZmJjODIzYzg3IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEwLTA2LTE0ICBU b255IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGVyc2lzdCBWOCdzIFNjcmlwdERhdGEgdG8g dGhlIG1lbW9yeSBjYWNoZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTM4NjYxCisKKyAgICAgICAgVGhpcyBzdG9yZXMgVjgncyBTY3JpcHREYXRhIGlu IHRoZSBtZW1vcnkgY2FjaGUgYW5kIGFsc28gY2F1c2VzIHRoZQorICAgICAgICBuZXR3b3JrIHBs YXRmb3JtIGxheWVyIHRvIGJlIG5vdGlmaWVkIG9mIHRoZSBhdmFpbGFibGUgY2FjaGVhYmxlCisg ICAgICAgIG1ldGFkYXRhLgorCisgICAgICAgIENocm9taXVtJ3MgbW9yZWpzIGJlbmNobWFyayBz aG93ZWQgYSB+NyUgaW1wcm92ZW1lbnQgd2hlbiB0aGlzIHdhcworICAgICAgICBvcmlnaW5hbGx5 IHN1Ym1pdHRlZCAoYmVmb3JlIGl0IGhhZCB0byBiZSByb2xsZWQgYmFjaykuCisKKyAgICAgICAg VGVzdDogZmFzdC9qcy9wYXJzZXItaGlnaC1ieXRlLWNoYXJhY3Rlci5odG1sCisKKyAgICAgICAg KiBiaW5kaW5ncy92OC9TY3JpcHRTb3VyY2VDb2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3Jp cHRTb3VyY2VDb2RlOjpTY3JpcHRTb3VyY2VDb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlw dFNvdXJjZUNvZGU6OmNhY2hlZFNjcmlwdCk6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhQcm94 eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOFByb3h5Ojpjb21waWxlU2NyaXB0KToKKyAgICAg ICAgKFdlYkNvcmU6OlY4UHJveHk6OnByZWNvbXBpbGVTY3JpcHQpOgorICAgICAgICAoV2ViQ29y ZTo6VjhQcm94eTo6ZXZhbHVhdGUpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJveHkuaDoK KwogMjAxMC0wNi0xOCAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGlu Z3MvdjgvU2NyaXB0U291cmNlQ29kZS5oIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTb3Vy Y2VDb2RlLmgKaW5kZXggNWMxNjE2OGU0MWYwNmI0MjYxZGU0YTk3MGRlNmRlMWE1NjRjNzI2Mi4u ZGJjOWQ1ZTZmYzYwMDdmY2ZkZDY2MDI0ZGIwNzgyNmM2NjI2M2I1YiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9iaW5kaW5ncy92OC9TY3JpcHRTb3VyY2VDb2RlLmgKKysrIGIvV2ViQ29yZS9iaW5kaW5n cy92OC9TY3JpcHRTb3VyY2VDb2RlLmgKQEAgLTMxLDYgKzMxLDcgQEAKICNpZm5kZWYgU2NyaXB0 U291cmNlQ29kZV9oCiAjZGVmaW5lIFNjcmlwdFNvdXJjZUNvZGVfaAogCisjaW5jbHVkZSAiQ2Fj aGVkUmVzb3VyY2VIYW5kbGUuaCIKICNpbmNsdWRlICJDYWNoZWRTY3JpcHQuaCIKICNpbmNsdWRl ICJLVVJMLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKQEAgLTQxLDYgKzQyLDcgQEAg Y2xhc3MgU2NyaXB0U291cmNlQ29kZSB7CiBwdWJsaWM6CiAgICAgU2NyaXB0U291cmNlQ29kZShj b25zdCBTdHJpbmcmIHNvdXJjZSwgY29uc3QgS1VSTCYgdXJsID0gS1VSTCgpLCBpbnQgc3RhcnRM aW5lID0gMSkKICAgICAgICAgOiBtX3NvdXJjZShzb3VyY2UpCisgICAgICAgICwgbV9jYWNoZWRT Y3JpcHQoMCkKICAgICAgICAgLCBtX3VybCh1cmwpCiAgICAgICAgICwgbV9zdGFydExpbmUoc3Rh cnRMaW5lKQogICAgIHsKQEAgLTUwLDYgKzUyLDcgQEAgcHVibGljOgogICAgIC8vIE5vdCBzdXJl IGlmIHRoYXQgbWF0dGVycy4KICAgICBTY3JpcHRTb3VyY2VDb2RlKENhY2hlZFNjcmlwdCogY3Mp CiAgICAgICAgIDogbV9zb3VyY2UoY3MtPnNjcmlwdCgpKQorICAgICAgICAsIG1fY2FjaGVkU2Ny aXB0KGNzKQogICAgICAgICAsIG1fdXJsKFBhcnNlZFVSTFN0cmluZywgY3MtPnVybCgpKQogICAg ICAgICAsIG1fc3RhcnRMaW5lKDEpCiAgICAgewpAQCAtNTgsMTEgKzYxLDEzIEBAIHB1YmxpYzoK ICAgICBib29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVybiBtX3NvdXJjZS5pc0VtcHR5KCk7IH0K IAogICAgIGNvbnN0IFN0cmluZyYgc291cmNlKCkgY29uc3QgeyByZXR1cm4gbV9zb3VyY2U7IH0K KyAgICBDYWNoZWRTY3JpcHQqIGNhY2hlZFNjcmlwdCgpIGNvbnN0IHsgcmV0dXJuIG1fY2FjaGVk U2NyaXB0LmdldCgpOyB9CiAgICAgY29uc3QgS1VSTCYgdXJsKCkgY29uc3QgeyByZXR1cm4gbV91 cmw7IH0KICAgICBpbnQgc3RhcnRMaW5lKCkgY29uc3QgeyByZXR1cm4gbV9zdGFydExpbmU7IH0K IAogcHJpdmF0ZToKICAgICBTdHJpbmcgbV9zb3VyY2U7CisgICAgQ2FjaGVkUmVzb3VyY2VIYW5k bGU8Q2FjaGVkU2NyaXB0PiBtX2NhY2hlZFNjcmlwdDsKICAgICBLVVJMIG1fdXJsOwogICAgIGlu dCBtX3N0YXJ0TGluZTsKIH07CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJv eHkuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAppbmRleCAzNDEzZjRmNzg4 ZmNlMGIyZjMwODgyZGFhMTllZWI5ZWQ1NGY3NjE4Li5iYjEwYzRmNDA4NDY4MGVkNzc4ZTcxMzQ2 OGZlMDQwYmM1ZjYwOWJlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHku Y3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAKQEAgLTMyLDYgKzMyLDcg QEAKICNpbmNsdWRlICJWOFByb3h5LmgiCiAKICNpbmNsdWRlICJDU1NNdXRhYmxlU3R5bGVEZWNs YXJhdGlvbi5oIgorI2luY2x1ZGUgIkNhY2hlZE1ldGFkYXRhLmgiCiAjaW5jbHVkZSAiRGF0ZUV4 dGVuc2lvbi5oIgogI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCiAjaW5jbHVkZSAiRnJhbWUu aCIKQEAgLTY5LDYgKzcwLDcgQEAKICNpbmNsdWRlIDx1dGlsaXR5PgogI2luY2x1ZGUgPHd0Zi9B c3NlcnRpb25zLmg+CiAjaW5jbHVkZSA8d3RmL093bkFycmF5UHRyLmg+CisjaW5jbHVkZSA8d3Rm L093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYv U3RyaW5nRXh0cmFzLmg+CiAjaW5jbHVkZSA8d3RmL1VudXNlZFBhcmFtLmg+CkBAIC0yMzIsMTMg KzIzNCwxMyBAQCBWOFByb3h5Ojp+VjhQcm94eSgpCiAgICAgd2luZG93U2hlbGwoKS0+ZGVzdHJv eUdsb2JhbCgpOwogfQogCi12ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IFY4UHJveHk6OmNvbXBpbGVT Y3JpcHQodjg6OkhhbmRsZTx2ODo6U3RyaW5nPiBjb2RlLCBjb25zdCBTdHJpbmcmIGZpbGVOYW1l LCBpbnQgYmFzZUxpbmUpCit2ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IFY4UHJveHk6OmNvbXBpbGVT Y3JpcHQodjg6OkhhbmRsZTx2ODo6U3RyaW5nPiBjb2RlLCBjb25zdCBTdHJpbmcmIGZpbGVOYW1l LCBpbnQgYmFzZUxpbmUsIHY4OjpTY3JpcHREYXRhKiBzY3JpcHREYXRhKQogewogICAgIGNvbnN0 IHVpbnQxNl90KiBmaWxlTmFtZVN0cmluZyA9IGZyb21XZWJDb3JlU3RyaW5nKGZpbGVOYW1lKTsK ICAgICB2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IG5hbWUgPSB2ODo6U3RyaW5nOjpOZXcoZmlsZU5h bWVTdHJpbmcsIGZpbGVOYW1lLmxlbmd0aCgpKTsKICAgICB2ODo6SGFuZGxlPHY4OjpJbnRlZ2Vy PiBsaW5lID0gdjg6OkludGVnZXI6Ok5ldyhiYXNlTGluZSk7CiAgICAgdjg6OlNjcmlwdE9yaWdp biBvcmlnaW4obmFtZSwgbGluZSk7Ci0gICAgdjg6OkhhbmRsZTx2ODo6U2NyaXB0PiBzY3JpcHQg PSB2ODo6U2NyaXB0OjpDb21waWxlKGNvZGUsICZvcmlnaW4pOworICAgIHY4OjpIYW5kbGU8djg6 OlNjcmlwdD4gc2NyaXB0ID0gdjg6OlNjcmlwdDo6Q29tcGlsZShjb2RlLCAmb3JpZ2luLCBzY3Jp cHREYXRhKTsKICAgICByZXR1cm4gc2NyaXB0OwogfQogCkBAIC0zMzcsNiArMzM5LDI4IEBAIGJv b2wgVjhQcm94eTo6c2V0SW5qZWN0ZWRTY3JpcHRDb250ZXh0RGVidWdJZCh2ODo6SGFuZGxlPHY4 OjpDb250ZXh0PiB0YXJnZXRDb250CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK1Bhc3NPd25QdHI8 djg6OlNjcmlwdERhdGE+IFY4UHJveHk6OnByZWNvbXBpbGVTY3JpcHQodjg6OkhhbmRsZTx2ODo6 U3RyaW5nPiBjb2RlLCBDYWNoZWRTY3JpcHQqIGNhY2hlZFNjcmlwdCkKK3sKKyAgICAvLyBBIHBz ZXVkby1yYW5kb21seSBjaG9zZW4gSUQgdXNlZCB0byBzdG9yZSBhbmQgcmV0cmlldmUgVjggU2Ny aXB0RGF0YSBmcm9tCisgICAgLy8gdGhlIENhY2hlZFNjcmlwdC4gSWYgdGhlIGZvcm1hdCBjaGFu Z2VzLCB0aGlzIElEIHNob3VsZCBiZSBjaGFuZ2VkIHRvby4KKyAgICBzdGF0aWMgY29uc3QgdW5z aWduZWQgZGF0YVR5cGVJRCA9IDB4RUNDMTNCRDc7CisKKyAgICAvLyBWZXJ5IHNtYWxsIHNjcmlw dHMgYXJlIG5vdCB3b3J0aCB0aGUgZWZmb3J0IHRvIHByZXBhcnNlLgorICAgIHN0YXRpYyBjb25z dCBpbnQgbWluUHJlcGFyc2VMZW5ndGggPSAxMDI0OworCisgICAgaWYgKCFjYWNoZWRTY3JpcHQg fHwgY29kZS0+TGVuZ3RoKCkgPCBtaW5QcmVwYXJzZUxlbmd0aCkKKyAgICAgICAgcmV0dXJuIDA7 CisKKyAgICBDYWNoZWRNZXRhZGF0YSogY2FjaGVkTWV0YWRhdGEgPSBjYWNoZWRTY3JpcHQtPmNh Y2hlZE1ldGFkYXRhKGRhdGFUeXBlSUQpOworICAgIGlmIChjYWNoZWRNZXRhZGF0YSkKKyAgICAg ICAgcmV0dXJuIHY4OjpTY3JpcHREYXRhOjpOZXcoY2FjaGVkTWV0YWRhdGEtPmRhdGEoKSwgY2Fj aGVkTWV0YWRhdGEtPnNpemUoKSk7CisKKyAgICBPd25QdHI8djg6OlNjcmlwdERhdGE+IHNjcmlw dERhdGEodjg6OlNjcmlwdERhdGE6OlByZUNvbXBpbGUoY29kZSkpOworICAgIGNhY2hlZFNjcmlw dC0+c2V0Q2FjaGVkTWV0YWRhdGEoZGF0YVR5cGVJRCwgc2NyaXB0RGF0YS0+RGF0YSgpLCBzY3Jp cHREYXRhLT5MZW5ndGgoKSk7CisKKyAgICByZXR1cm4gc2NyaXB0RGF0YS5yZWxlYXNlKCk7Cit9 CisKIHY4OjpMb2NhbDx2ODo6VmFsdWU+IFY4UHJveHk6OmV2YWx1YXRlKGNvbnN0IFNjcmlwdFNv dXJjZUNvZGUmIHNvdXJjZSwgTm9kZSogbm9kZSkKIHsKICAgICBBU1NFUlQodjg6OkNvbnRleHQ6 OkluQ29udGV4dCgpKTsKQEAgLTM2MiwxMCArMzg2LDExIEBAIHY4OjpMb2NhbDx2ODo6VmFsdWU+ IFY4UHJveHk6OmV2YWx1YXRlKGNvbnN0IFNjcmlwdFNvdXJjZUNvZGUmIHNvdXJjZSwgTm9kZSog bm9kCiAjaWYgUExBVEZPUk0oQ0hST01JVU0pCiAgICAgICAgIFBsYXRmb3JtQnJpZGdlOjp0cmFj ZUV2ZW50QmVnaW4oInY4LmNvbXBpbGUiLCBub2RlLCAiIik7CiAjZW5kaWYKKyAgICAgICAgT3du UHRyPHY4OjpTY3JpcHREYXRhPiBzY3JpcHREYXRhID0gcHJlY29tcGlsZVNjcmlwdChjb2RlLCBz b3VyY2UuY2FjaGVkU2NyaXB0KCkpOwogCiAgICAgICAgIC8vIE5PVEU6IEZvciBjb21wYXRpYmls aXR5IHdpdGggV2ViQ29yZSwgU2NyaXB0U291cmNlQ29kZSdzIGxpbmUgc3RhcnRzIGF0CiAgICAg ICAgIC8vIDEsIHdoZXJlYXMgdjggc3RhcnRzIGF0IDAuCi0gICAgICAgIHY4OjpIYW5kbGU8djg6 OlNjcmlwdD4gc2NyaXB0ID0gY29tcGlsZVNjcmlwdChjb2RlLCBzb3VyY2UudXJsKCksIHNvdXJj ZS5zdGFydExpbmUoKSAtIDEpOworICAgICAgICB2ODo6SGFuZGxlPHY4OjpTY3JpcHQ+IHNjcmlw dCA9IGNvbXBpbGVTY3JpcHQoY29kZSwgc291cmNlLnVybCgpLCBzb3VyY2Uuc3RhcnRMaW5lKCkg LSAxLCBzY3JpcHREYXRhLmdldCgpKTsKICNpZiBQTEFURk9STShDSFJPTUlVTSkKICAgICAgICAg UGxhdGZvcm1CcmlkZ2U6OnRyYWNlRXZlbnRFbmQoInY4LmNvbXBpbGUiLCBub2RlLCAiIik7CiAK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oIGIvV2ViQ29yZS9iaW5k aW5ncy92OC9WOFByb3h5LmgKaW5kZXggMTcxOTUwYmVkMWZhMGFiZmRkNDRiODg4M2Q4MzQ4ZTBl OTRiYjRlNi4uMTNlYjI1YzkwMmVlMmQ1YjNlYzBkODhhNTdhNWFmZWM1YzhmYTgzNiAxMDA2NDQK LS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgKKysrIGIvV2ViQ29yZS9iaW5kaW5n cy92OC9WOFByb3h5LmgKQEAgLTUzLDYgKzUzLDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CisgICAgY2xhc3MgQ2FjaGVkU2NyaXB0OwogICAgIGNsYXNzIERPTVdpbmRvdzsKICAgICBjbGFz cyBGcmFtZTsKICAgICBjbGFzcyBOb2RlOwpAQCAtMjg1LDcgKzI4Niw3IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAogICAgICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGNoZWNrTmV3 TGVnYWwoY29uc3Qgdjg6OkFyZ3VtZW50cyYpOwogCi0gICAgICAgIHN0YXRpYyB2ODo6SGFuZGxl PHY4OjpTY3JpcHQ+IGNvbXBpbGVTY3JpcHQodjg6OkhhbmRsZTx2ODo6U3RyaW5nPiBjb2RlLCBj b25zdCBTdHJpbmcmIGZpbGVOYW1lLCBpbnQgYmFzZUxpbmUpOworICAgICAgICBzdGF0aWMgdjg6 OkhhbmRsZTx2ODo6U2NyaXB0PiBjb21waWxlU2NyaXB0KHY4OjpIYW5kbGU8djg6OlN0cmluZz4g Y29kZSwgY29uc3QgU3RyaW5nJiBmaWxlTmFtZSwgaW50IGJhc2VMaW5lLCB2ODo6U2NyaXB0RGF0 YSogPSAwKTsKIAogICAgICAgICAvLyBJZiB0aGUgZXhjZXB0aW9uIGNvZGUgaXMgZGlmZmVyZW50 IGZyb20gemVybywgYSBET00gZXhjZXB0aW9uIGlzCiAgICAgICAgIC8vIHNjaGVkdWxlIHRvIGJl IHRocm93bi4KQEAgLTM0MSw2ICszNDIsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAg ICAgdm9pZCByZXNldElzb2xhdGVkV29ybGRzKCk7CiAKKyAgICAgICAgUGFzc093blB0cjx2ODo6 U2NyaXB0RGF0YT4gcHJlY29tcGlsZVNjcmlwdCh2ODo6SGFuZGxlPHY4OjpTdHJpbmc+LCBDYWNo ZWRTY3JpcHQqKTsKKwogICAgICAgICAvLyBSZXR1cm5zIGZhbHNlIHdoZW4gd2UncmUgb3V0IG9m IG1lbW9yeSBpbiBWOC4KICAgICAgICAgYm9vbCBzZXRJbmplY3RlZFNjcmlwdENvbnRleHREZWJ1 Z0lkKHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IHRhcmdldENvbnRleHQpOwogCg==