160870 2016-08-15 15:28:14 -0700 Member call on NULL pointer in JavaScriptCore/dfg/DFGAbstractInterpretterInlines.h 2016-09-06 16:53:28 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jbedard saam benjamin commit-queue darin fpizlo ggaren gskachkov jfbastien keith_miller mark.lam msaboff oliver saam sukolsak ticaiolima ysuzuki oldest_to_newest 1220181 0 jbedard 2016-08-15 15:28:14 -0700 In a few cases (js/regress/simple-regexp-exec-folding.html, for example) forAllTransitiveIncomingValues in PhiChildren (JavaScriptCore/dfg/DFGPhiChildren.h) is called from a NULL pointer. Because of the current implementation of forAllTransitiveIncomingValues, this does not currently cause a crash. It is, however, an obvious bug, especially because in another case, the caller checks the PhiChildren pointer before calling this function. NULL pointer: JavaScriptCore/dfg/DFGAbstractInterpretterInlines.h line 1997 Analogous call: JavaScriptCore/dfg/DFGAbstractInterpretterInlines.h line 2273 1220193 1 286102 jbedard 2016-08-15 15:45:13 -0700 Created attachment 286102 Patch 1220196 2 jbedard 2016-08-15 15:46:05 -0700 This patch will fail style check, since it contains an edit to a Lambda function. 1220197 3 commit-queue 2016-08-15 15:48:07 -0700 Attachment 286102 did not pass style-queue: ERROR: Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h:2000: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1220381 4 286102 darin 2016-08-15 23:31:26 -0700 Comment on attachment 286102 Patch Needs a test case. 1220511 5 286102 saam 2016-08-16 11:55:30 -0700 Comment on attachment 286102 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=286102&action=review > Source/JavaScriptCore/ChangeLog:9 > + (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects): NULL check on m_phiChildren before function call. Can you elaborate on why this happens? 1220596 6 jbedard 2016-08-16 15:18:18 -0700 I will revisit this bug tomorrow. Changes in the last 24 hours have resulted in my inability to duplicate it. I will update my undefined behavior sanitizer and see if I can replicate this bug (unfortunately, the undefined behavior sanitizer takes hours to build if top-level headers have been changed) 1220910 7 286310 jbedard 2016-08-17 11:53:55 -0700 Created attachment 286310 Patch 1220911 8 commit-queue 2016-08-17 11:55:18 -0700 Attachment 286310 did not pass style-queue: ERROR: Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h:2000: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1220913 9 jbedard 2016-08-17 12:02:09 -0700 A quick update on Daren's request: This is going to be a very difficult change to test. The most obvious way would be to integrate undefined behavior sanitizer into our testing infrastructure, although this is many months off if it will happen at all. The other method of testing would be construct a test which would crash without this change. While this is likely possible, it's unclear to me what such a test would like like. While attempting to construct a test which would crash without this change, I discovered that it really only seems to be js/regress/simple-regexp-exec-folding.html which exhibits the bug, but even this test will not always exhibit this error (most notably, is the number of iterations through the loop is decreased, the error will no longer occur). If uncovering the precise code path which triggers this bug is important, I can continue to investigate. However, I don't think continued investigation is worthwhile, as an analogous case in forAllTransitiveIncomingValues preforms this check. 1221691 10 286310 darin 2016-08-20 19:16:16 -0700 Comment on attachment 286310 Patch No review yet. Who's going to review this? 1221702 11 saam 2016-08-20 21:51:38 -0700 (In reply to comment #9) > A quick update on Daren's request: This is going to be a very difficult > change to test. The most obvious way would be to integrate undefined > behavior sanitizer into our testing infrastructure, although this is many > months off if it will happen at all. > > The other method of testing would be construct a test which would crash > without this change. While this is likely possible, it's unclear to me what > such a test would like like. While attempting to construct a test which > would crash without this change, I discovered that it really only seems to > be js/regress/simple-regexp-exec-folding.html which exhibits the bug, but > even this test will not always exhibit this error (most notably, is the > number of iterations through the loop is decreased, the error will no longer > occur). So there is a test where we call this function on a nullptr? If so, why don't we crash? Does that function not load any fields? If not, I'm a bit confused as to what your explanation for needing this check is. I'm not too familiar about which states this particular field can be null in, but there are other places where we allow for null in a pointer field, but later access it without a null check because other conditions being true imply that the field is non-null. (This may or may not be the case here). > > If uncovering the precise code path which triggers this bug is important, I > can continue to investigate. However, I don't think continued investigation > is worthwhile, as an analogous case in forAllTransitiveIncomingValues > preforms this check. 1221703 12 saam 2016-08-20 21:52:34 -0700 When you say that that particular test "exhibits the bug", what exactly do you mean? 1221705 13 darin 2016-08-20 21:59:54 -0700 Jonathan has been compiling WebKit with clang's UndefinedBehaviorSanitizer <http://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html>. When compiled like this, code will trap if it makes a non-static function member call with a nullptr for the this pointer. I think of it as a way to add additional assertions. When Jonathan is saying that a test "exhibits the bug", he means that when compiled that way, that test hit the trap. 1221706 14 darin 2016-08-20 22:01:09 -0700 Please note: It’s not legal C++ to call a non-static member function with a null pointer for this, even if the function is non-virtual, and even if the function doesn't access the this pointer directly or indirectly. 1221753 15 saam 2016-08-21 11:14:28 -0700 (In reply to comment #13) > Jonathan has been compiling WebKit with clang's UndefinedBehaviorSanitizer > <http://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html>. When compiled > like this, code will trap if it makes a non-static function member call with > a nullptr for the this pointer. > > I think of it as a way to add additional assertions. > > When Jonathan is saying that a test "exhibits the bug", he means that when > compiled that way, that test hit the trap. I see. Very cool, I didn't know this was a thing. 1221756 16 286310 saam 2016-08-21 11:19:52 -0700 Comment on attachment 286310 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=286310&action=review > Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h:2003 > + if (m_phiChildren) { > + m_phiChildren->forAllTransitiveIncomingValues( > + m_graph.varArgChild(node, 0).node(), > + [&] (Node* incoming) { > + set.add(incoming->castConstant<Structure*>()); > + }); > + } Filip recently added code that will add MaterializeNewObject into the IR even when we're not in SSA. This is when we do RegExp constant folding on various RegExp operations, like RegExp.prototype.exec. That said, I don't think this code is correct when we're not in SSA form. For example, I think you're saying that the result of this node is the emptySet of structures when we're not in SSA. That's not what we want. If anything, if we can't give a specific result filled with structure sets, we probably want to widen our result type to just arbitrary Object or something similar to that. However, maybe there are other methods in which we can attain the Structure(s) that this produce in non-SSA form. Filip, what do you think? 1221757 17 saam 2016-08-21 11:23:03 -0700 Actually, it looks like the StructureSet is in the first OpInfo of the node. It seems like we should use that. (I'm looking at the code in StrengthReductionPhase that generates this node). 1221758 18 saam 2016-08-21 11:25:26 -0700 (In reply to comment #17) > Actually, it looks like the StructureSet is in the first OpInfo of the node. > It seems like we should use that. > (I'm looking at the code in StrengthReductionPhase that generates this node). Actually, it looks like that's what happens when we add this node to the IR for allocation sinking phase as well. The first OpInfo of the node has the StructureSet of the resulting type. I believe the correct patch is to use the StructureSet from the OpInfo to mark as the result of this node. 1225991 19 287826 saam 2016-09-02 15:37:17 -0700 Created attachment 287826 patch 1225993 20 287826 mark.lam 2016-09-02 15:39:03 -0700 Comment on attachment 287826 patch View in context: https://bugs.webkit.org/attachment.cgi?id=287826&action=review > Source/JavaScriptCore/ChangeLog:11 > + The rule for MaterlializeNewObject inside AI was assuming that the graph /MaterlializeNewObject/MaterializeNewObject/ 1225995 21 287828 saam 2016-09-02 15:43:05 -0700 Created attachment 287828 patch 1226007 22 saam 2016-09-02 15:58:22 -0700 This looks like its breaking an AsmJS test, not sure why. I'll investigate. 1226009 23 saam 2016-09-02 16:06:40 -0700 (In reply to comment #22) > This looks like its breaking an AsmJS test, not sure why. I'll investigate. actually, this failure looks unrelated to my change. Investigating now. 1226012 24 saam 2016-09-02 16:16:19 -0700 (In reply to comment #23) > (In reply to comment #22) > > This looks like its breaking an AsmJS test, not sure why. I'll investigate. > > actually, this failure looks unrelated to my change. Investigating now. Never mind, It looks like I'm running an older version of asm js. 1226111 25 287828 darin 2016-09-03 06:46:07 -0700 Comment on attachment 287828 patch View in context: https://bugs.webkit.org/attachment.cgi?id=287828&action=review > Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h:1953 > + const StructureSet& set = node->structureSet(); > forNode(node).set(m_graph, set); Why the local variable? Does not seem like it makes this code clearer. 1226907 26 saam 2016-09-06 16:06:52 -0700 (In reply to comment #25) > Comment on attachment 287828 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=287828&action=review > > > Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h:1953 > > + const StructureSet& set = node->structureSet(); > > forNode(node).set(m_graph, set); > > Why the local variable? Does not seem like it makes this code clearer. Thanks for the review. No reason in particular for the local variable, I was just refactoring the old code. I agree that it's not needed, I'll remove it. 1226910 27 288060 saam 2016-09-06 16:10:32 -0700 Created attachment 288060 patch for landing 1226928 28 288060 commit-queue 2016-09-06 16:53:22 -0700 Comment on attachment 288060 patch for landing Clearing flags on attachment: 288060 Committed r205522: <http://trac.webkit.org/changeset/205522> 1226929 29 commit-queue 2016-09-06 16:53:28 -0700 All reviewed patches have been landed. Closing bug. 286102 2016-08-15 15:45:13 -0700 2016-08-17 11:53:51 -0700 Patch bug-160870-20160815154328.patch text/plain 1773 jbedard SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA0NDg1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDE2LTA4LTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAg ICAgICBNZW1iZXIgY2FsbCBvbiBOVUxMIHBvaW50ZXIgaW4gSmF2YVNjcmlwdENvcmUvZGZnL0RG R0Fic3RyYWN0SW50ZXJwcmV0dGVySW5saW5lcy5oCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjA4NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGRmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5l cy5oOgorICAgICAgICAoSlNDOjpERkc6OkFic3RyYWN0SW50ZXJwcmV0ZXI8QWJzdHJhY3RTdGF0 ZVR5cGU+OjpleGVjdXRlRWZmZWN0cyk6IE5VTEwgY2hlY2sgb24gbV9waGlDaGlsZHJlbiBiZWZv cmUgZnVuY3Rpb24gY2FsbC4KKwogMjAxNi0wOC0xNSAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBs ZS5jb20+CiAKICAgICAgICAgTWFrZSBKU1ZhbHVlOjpzdHJpY3RFcXVhbCgpIGhhbmRsZSBmYWls dXJlcyB0byByZXNvbHZlIEpTUm9wZVN0cmluZ3MuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5oCShy ZXZpc2lvbiAyMDQ0NjcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0 SW50ZXJwcmV0ZXJJbmxpbmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTE5OTQsMTEgKzE5OTQsMTMg QEAgYm9vbCBBYnN0cmFjdEludGVycHJldGVyPEFic3RyYWN0U3RhdGVUeQogICAgIGNhc2UgTWF0 ZXJpYWxpemVOZXdPYmplY3Q6IHsKICAgICAgICAgU3RydWN0dXJlU2V0IHNldDsKICAgICAgICAg Ci0gICAgICAgIG1fcGhpQ2hpbGRyZW4tPmZvckFsbFRyYW5zaXRpdmVJbmNvbWluZ1ZhbHVlcygK LSAgICAgICAgICAgIG1fZ3JhcGgudmFyQXJnQ2hpbGQobm9kZSwgMCkubm9kZSgpLAotICAgICAg ICAgICAgWyZdIChOb2RlKiBpbmNvbWluZykgewotICAgICAgICAgICAgICAgIHNldC5hZGQoaW5j b21pbmctPmNhc3RDb25zdGFudDxTdHJ1Y3R1cmUqPigpKTsKLSAgICAgICAgICAgIH0pOworICAg ICAgICBpZiAobV9waGlDaGlsZHJlbikgeworICAgICAgICAgICAgbV9waGlDaGlsZHJlbi0+Zm9y QWxsVHJhbnNpdGl2ZUluY29taW5nVmFsdWVzKAorICAgICAgICAgICAgICAgIG1fZ3JhcGgudmFy QXJnQ2hpbGQobm9kZSwgMCkubm9kZSgpLAorICAgICAgICAgICAgICAgIFsmXSAoTm9kZSogaW5j b21pbmcpIHsKKyAgICAgICAgICAgICAgICAgICAgc2V0LmFkZChpbmNvbWluZy0+Y2FzdENvbnN0 YW50PFN0cnVjdHVyZSo+KCkpOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICB9CiAgICAg ICAgIAogICAgICAgICBmb3JOb2RlKG5vZGUpLnNldChtX2dyYXBoLCBzZXQpOwogICAgICAgICBi cmVhazsK 286310 2016-08-17 11:53:55 -0700 2016-09-02 15:37:17 -0700 Patch bug-160870-20160817115207.patch text/plain 1791 jbedard SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA0NTIwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDE2LTA4LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAg ICAgICBNZW1iZXIgY2FsbCBvbiBOVUxMIHBvaW50ZXIgaW4gSmF2YVNjcmlwdENvcmUvZGZnL0RG R0Fic3RyYWN0SW50ZXJwcmV0dGVySW5saW5lcy5oCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjA4NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGRmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5l cy5oOgorICAgICAgICAoSlNDOjpERkc6OkFic3RyYWN0SW50ZXJwcmV0ZXI8QWJzdHJhY3RTdGF0 ZVR5cGU+OjpleGVjdXRlRWZmZWN0cyk6IENoZWNrIG9uIG1fcGhpQ2hpbGRyZW4gYmVmb3JlIGZ1 bmN0aW9uIGNhbGwgYmVjYXVzZSBtX3BoaUNoaWxkcmVuIGNhbiBiZSBOVUxMLgorCiAyMDE2LTA4 LTE1ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIENvbnZlcnNp b24gdG8gc2VxdWVuY2U8VD4gaXMgYnJva2VuIGZvciBpdGVyYWJsZSBvYmplY3RzCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdEludGVy cHJldGVySW5saW5lcy5oCShyZXZpc2lvbiAyMDQ1MjApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgJKHdvcmtpbmcgY29weSkKQEAg LTE5OTQsMTEgKzE5OTQsMTMgQEAgYm9vbCBBYnN0cmFjdEludGVycHJldGVyPEFic3RyYWN0U3Rh dGVUeQogICAgIGNhc2UgTWF0ZXJpYWxpemVOZXdPYmplY3Q6IHsKICAgICAgICAgU3RydWN0dXJl U2V0IHNldDsKICAgICAgICAgCi0gICAgICAgIG1fcGhpQ2hpbGRyZW4tPmZvckFsbFRyYW5zaXRp dmVJbmNvbWluZ1ZhbHVlcygKLSAgICAgICAgICAgIG1fZ3JhcGgudmFyQXJnQ2hpbGQobm9kZSwg MCkubm9kZSgpLAotICAgICAgICAgICAgWyZdIChOb2RlKiBpbmNvbWluZykgewotICAgICAgICAg ICAgICAgIHNldC5hZGQoaW5jb21pbmctPmNhc3RDb25zdGFudDxTdHJ1Y3R1cmUqPigpKTsKLSAg ICAgICAgICAgIH0pOworICAgICAgICBpZiAobV9waGlDaGlsZHJlbikgeworICAgICAgICAgICAg bV9waGlDaGlsZHJlbi0+Zm9yQWxsVHJhbnNpdGl2ZUluY29taW5nVmFsdWVzKAorICAgICAgICAg ICAgICAgIG1fZ3JhcGgudmFyQXJnQ2hpbGQobm9kZSwgMCkubm9kZSgpLAorICAgICAgICAgICAg ICAgIFsmXSAoTm9kZSogaW5jb21pbmcpIHsKKyAgICAgICAgICAgICAgICAgICAgc2V0LmFkZChp bmNvbWluZy0+Y2FzdENvbnN0YW50PFN0cnVjdHVyZSo+KCkpOworICAgICAgICAgICAgICAgIH0p OworICAgICAgICB9CiAgICAgICAgIAogICAgICAgICBmb3JOb2RlKG5vZGUpLnNldChtX2dyYXBo LCBzZXQpOwogICAgICAgICBicmVhazsK 287826 2016-09-02 15:37:17 -0700 2016-09-02 15:43:05 -0700 patch b-backup.diff text/plain 2096 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA1Mzc2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDE2LTA5LTAyICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IE1lbWJlciBjYWxsIG9uIE5VTEwgcG9pbnRlciBpbiBKYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJz dHJhY3RJbnRlcnByZXR0ZXJJbmxpbmVzLmgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2MDg3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIENyZWRpdCBnb2VzIHRvIEpvbmF0aGFuIEJlZGFyZCBmb3IgZmlu ZGluZyB0aGlzIGJ1ZyB1c2luZyB0aGUgdW5kZWZpbmVkCisgICAgICAgIGJlaGF2aW9yIHNhbml0 aXplci4KKworICAgICAgICBUaGUgcnVsZSBmb3IgTWF0ZXJsaWFsaXplTmV3T2JqZWN0IGluc2lk ZSBBSSB3YXMgYXNzdW1pbmcgdGhhdCB0aGUgZ3JhcGgKKyAgICAgICAgd2FzIGluIFNTQSBmb3Jt LiBUaGlzIHVzZWQgdG8gYmUgdHJ1ZSB3aGVuIE1hdGVyaWFsaXplTmV3T2JqZWN0IHdhcyBvbmx5 CisgICAgICAgIGluc2VydGVkIGJ5IHRoZSBhbGxvY2F0aW9uIHNpbmtpbmcgcGhhc2UuIEhvd2V2 ZXIsIEZpbGlwIGFkZGVkIG1vcmUgdXNlcworICAgICAgICBvZiBNYXRlcmlhbGl6ZU5ld09iamVj dCBpbiBoaXMgUmVnRXhwIGNvbnN0YW50IGZvbGRpbmcgcGF0Y2guIFRoaXMgZml4ZXMKKyAgICAg ICAgdGhlIGJ1ZyBieSB1c2luZyB0aGUgc3RydWN0dXJlIHNldCBpbnNpZGUgdGhlIE5vZGUncyBP cEluZm8gcmF0aGVyIHRoYW4KKyAgICAgICAgZ2VuZXJhdGluZyBpdCBmcm9tIG1fcGhpQ2hpbGRy ZW4gaW5zaWRlIEFJLgorCisgICAgICAgICogZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxp bmVzLmg6CisgICAgICAgIChKU0M6OkRGRzo6QWJzdHJhY3RJbnRlcnByZXRlcjxBYnN0cmFjdFN0 YXRlVHlwZT46OmV4ZWN1dGVFZmZlY3RzKToKKwogMjAxNi0wOS0wMiAgQ2hyaXMgRHVtZXogIDxj ZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGwgb3V0IHIyMDUzNTQg YmVjYXVzZSBpdCBjYXVzZWQgSlNDIHRlc3QgZmFpbHVyZXMKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHQWJzdHJhY3RJbnRlcnByZXRlcklubGluZXMuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVz LmgJKHJldmlzaW9uIDIwNTM3NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJz dHJhY3RJbnRlcnByZXRlcklubGluZXMuaAkod29ya2luZyBjb3B5KQpAQCAtMTk0OSwxNCArMTk0 OSw3IEBAIGJvb2wgQWJzdHJhY3RJbnRlcnByZXRlcjxBYnN0cmFjdFN0YXRlVHkKICAgICAgICAg YnJlYWs7CiAgICAgICAgIAogICAgIGNhc2UgTWF0ZXJpYWxpemVOZXdPYmplY3Q6IHsKLSAgICAg ICAgU3RydWN0dXJlU2V0IHNldDsKLSAgICAgICAgCi0gICAgICAgIG1fcGhpQ2hpbGRyZW4tPmZv ckFsbFRyYW5zaXRpdmVJbmNvbWluZ1ZhbHVlcygKLSAgICAgICAgICAgIG1fZ3JhcGgudmFyQXJn Q2hpbGQobm9kZSwgMCkubm9kZSgpLAotICAgICAgICAgICAgWyZdIChOb2RlKiBpbmNvbWluZykg ewotICAgICAgICAgICAgICAgIHNldC5hZGQoaW5jb21pbmctPmNhc3RDb25zdGFudDxTdHJ1Y3R1 cmUqPigpKTsKLSAgICAgICAgICAgIH0pOwotICAgICAgICAKKyAgICAgICAgY29uc3QgU3RydWN0 dXJlU2V0JiBzZXQgPSBub2RlLT5zdHJ1Y3R1cmVTZXQoKTsKICAgICAgICAgZm9yTm9kZShub2Rl KS5zZXQobV9ncmFwaCwgc2V0KTsKICAgICAgICAgYnJlYWs7CiAgICAgfQo= 287828 2016-09-02 15:43:05 -0700 2016-09-06 16:10:32 -0700 patch b-backup.diff text/plain 2094 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA1Mzc2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDE2LTA5LTAyICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IE1lbWJlciBjYWxsIG9uIE5VTEwgcG9pbnRlciBpbiBKYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJz dHJhY3RJbnRlcnByZXR0ZXJJbmxpbmVzLmgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2MDg3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIENyZWRpdCBnb2VzIHRvIEpvbmF0aGFuIEJlZGFyZCBmb3IgZmlu ZGluZyB0aGlzIGJ1ZyB1c2luZyB0aGUgdW5kZWZpbmVkCisgICAgICAgIGJlaGF2aW9yIHNhbml0 aXplci4KKworICAgICAgICBUaGUgcnVsZSBmb3IgTWF0ZXJpYWxpemVOZXdPYmplY3QgaW5zaWRl IEFJIHdhcyBhc3N1bWluZyB0aGF0IHRoZSBncmFwaAorICAgICAgICBpcyBpbiBTU0EgZm9ybS4g VGhpcyB1c2VkIHRvIGJlIHRydWUgd2hlbiBNYXRlcmlhbGl6ZU5ld09iamVjdCB3YXMgb25seQor ICAgICAgICBpbnNlcnRlZCBieSB0aGUgYWxsb2NhdGlvbiBzaW5raW5nIHBoYXNlLiBIb3dldmVy LCBGaWxpcCBhZGRlZCBtb3JlIHVzZXMKKyAgICAgICAgb2YgTWF0ZXJpYWxpemVOZXdPYmplY3Qg aW4gaGlzIFJlZ0V4cCBjb25zdGFudCBmb2xkaW5nIHBhdGNoLiBUaGlzIGZpeGVzCisgICAgICAg IHRoZSBidWcgYnkgdXNpbmcgdGhlIHN0cnVjdHVyZSBzZXQgaW5zaWRlIHRoZSBOb2RlJ3MgT3BJ bmZvIHJhdGhlciB0aGFuCisgICAgICAgIGdlbmVyYXRpbmcgaXQgZnJvbSBtX3BoaUNoaWxkcmVu IGluc2lkZSBBSS4KKworICAgICAgICAqIGRmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5l cy5oOgorICAgICAgICAoSlNDOjpERkc6OkFic3RyYWN0SW50ZXJwcmV0ZXI8QWJzdHJhY3RTdGF0 ZVR5cGU+OjpleGVjdXRlRWZmZWN0cyk6CisKIDIwMTYtMDktMDIgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsIG91dCByMjA1MzU0IGJl Y2F1c2UgaXQgY2F1c2VkIEpTQyB0ZXN0IGZhaWx1cmVzCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5o CShyZXZpc2lvbiAyMDUzNzUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3Ry YWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTE5NDksMTQgKzE5NDks NyBAQCBib29sIEFic3RyYWN0SW50ZXJwcmV0ZXI8QWJzdHJhY3RTdGF0ZVR5CiAgICAgICAgIGJy ZWFrOwogICAgICAgICAKICAgICBjYXNlIE1hdGVyaWFsaXplTmV3T2JqZWN0OiB7Ci0gICAgICAg IFN0cnVjdHVyZVNldCBzZXQ7Ci0gICAgICAgIAotICAgICAgICBtX3BoaUNoaWxkcmVuLT5mb3JB bGxUcmFuc2l0aXZlSW5jb21pbmdWYWx1ZXMoCi0gICAgICAgICAgICBtX2dyYXBoLnZhckFyZ0No aWxkKG5vZGUsIDApLm5vZGUoKSwKLSAgICAgICAgICAgIFsmXSAoTm9kZSogaW5jb21pbmcpIHsK LSAgICAgICAgICAgICAgICBzZXQuYWRkKGluY29taW5nLT5jYXN0Q29uc3RhbnQ8U3RydWN0dXJl Kj4oKSk7Ci0gICAgICAgICAgICB9KTsKLSAgICAgICAgCisgICAgICAgIGNvbnN0IFN0cnVjdHVy ZVNldCYgc2V0ID0gbm9kZS0+c3RydWN0dXJlU2V0KCk7CiAgICAgICAgIGZvck5vZGUobm9kZSku c2V0KG1fZ3JhcGgsIHNldCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0K 288060 2016-09-06 16:10:32 -0700 2016-09-06 16:53:22 -0700 patch for landing c-backup.diff text/plain 2084 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA1NTE4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDE2LTA5LTA2ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IE1lbWJlciBjYWxsIG9uIE5VTEwgcG9pbnRlciBpbiBKYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJz dHJhY3RJbnRlcnByZXR0ZXJJbmxpbmVzLmgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2MDg3MAorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFk bGVyLgorCisgICAgICAgIENyZWRpdCBnb2VzIHRvIEpvbmF0aGFuIEJlZGFyZCBmb3IgZmluZGlu ZyB0aGlzIGJ1ZyB1c2luZyB0aGUgdW5kZWZpbmVkCisgICAgICAgIGJlaGF2aW9yIHNhbml0aXpl ci4KKworICAgICAgICBUaGUgcnVsZSBmb3IgTWF0ZXJpYWxpemVOZXdPYmplY3QgaW5zaWRlIEFJ IHdhcyBhc3N1bWluZyB0aGF0IHRoZSBncmFwaAorICAgICAgICBpcyBpbiBTU0EgZm9ybS4gVGhp cyB1c2VkIHRvIGJlIHRydWUgd2hlbiBNYXRlcmlhbGl6ZU5ld09iamVjdCB3YXMgb25seQorICAg ICAgICBpbnNlcnRlZCBieSB0aGUgYWxsb2NhdGlvbiBzaW5raW5nIHBoYXNlLiBIb3dldmVyLCBG aWxpcCBhZGRlZCBtb3JlIHVzZXMKKyAgICAgICAgb2YgTWF0ZXJpYWxpemVOZXdPYmplY3QgaW4g aGlzIFJlZ0V4cCBjb25zdGFudCBmb2xkaW5nIHBhdGNoLiBUaGlzIGZpeGVzCisgICAgICAgIHRo ZSBidWcgYnkgdXNpbmcgdGhlIHN0cnVjdHVyZSBzZXQgaW5zaWRlIHRoZSBOb2RlJ3MgT3BJbmZv IHJhdGhlciB0aGFuCisgICAgICAgIGdlbmVyYXRpbmcgaXQgZnJvbSBtX3BoaUNoaWxkcmVuIGlu c2lkZSBBSS4KKworICAgICAgICAqIGRmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5o OgorICAgICAgICAoSlNDOjpERkc6OkFic3RyYWN0SW50ZXJwcmV0ZXI8QWJzdHJhY3RTdGF0ZVR5 cGU+OjpleGVjdXRlRWZmZWN0cyk6CisKIDIwMTYtMDktMDYgIEJlbmphbWluIFBvdWxhaW4gIDxi cG91bGFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gTWFrZSBBcml0aENsejMyIHdvcmsg d2l0aCBDZWxsIGFyZ3VtZW50cwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdB YnN0cmFjdEludGVycHJldGVySW5saW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHQWJzdHJhY3RJbnRlcnByZXRlcklubGluZXMuaAkocmV2aXNpb24gMjA1 NTE0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdEludGVycHJldGVy SW5saW5lcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xOTQ5LDE1ICsxOTQ5LDcgQEAgYm9vbCBBYnN0 cmFjdEludGVycHJldGVyPEFic3RyYWN0U3RhdGVUeQogICAgICAgICBicmVhazsKICAgICAgICAg CiAgICAgY2FzZSBNYXRlcmlhbGl6ZU5ld09iamVjdDogewotICAgICAgICBTdHJ1Y3R1cmVTZXQg c2V0OwotICAgICAgICAKLSAgICAgICAgbV9waGlDaGlsZHJlbi0+Zm9yQWxsVHJhbnNpdGl2ZUlu Y29taW5nVmFsdWVzKAotICAgICAgICAgICAgbV9ncmFwaC52YXJBcmdDaGlsZChub2RlLCAwKS5u b2RlKCksCi0gICAgICAgICAgICBbJl0gKE5vZGUqIGluY29taW5nKSB7Ci0gICAgICAgICAgICAg ICAgc2V0LmFkZChpbmNvbWluZy0+Y2FzdENvbnN0YW50PFN0cnVjdHVyZSo+KCkpOwotICAgICAg ICAgICAgfSk7Ci0gICAgICAgIAotICAgICAgICBmb3JOb2RlKG5vZGUpLnNldChtX2dyYXBoLCBz ZXQpOworICAgICAgICBmb3JOb2RlKG5vZGUpLnNldChtX2dyYXBoLCBub2RlLT5zdHJ1Y3R1cmVT ZXQoKSk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KIAo=