75532 2012-01-04 01:55:49 -0800 [v8] Null pointer exception if a typed array constructor set to a primitive value. 2012-01-05 12:41:36 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 68890 1 ulan ulan abarth japhet kbr webkit.review.bot oldest_to_newest 529423 0 ulan 2012-01-04 01:55:49 -0800 Running the following script generates a null pointer exception: <script> window.Uint8Array = 0; new Float64Array(function () {}); </script> For more details, see http://code.google.com/p/v8/issues/detail?id=1877. 529426 1 121089 ulan 2012-01-04 02:35:16 -0800 Created attachment 121089 Make sure that V8ArrayBufferViewCustomScript.js does not throw exception. Added guards in V8ArrayBufferViewCustomScript.js so that we do not try to optimize the "set" method if the typed array constructor was redefined. 529499 2 121106 ulan 2012-01-04 06:24:15 -0800 Created attachment 121106 More robust guard Avoid using hasOwnProperty since it might be also redefined. 529528 3 121106 abarth 2012-01-04 07:48:50 -0800 Comment on attachment 121106 More robust guard View in context: https://bugs.webkit.org/attachment.cgi?id=121106&action=review > Source/WebCore/bindings/v8/custom/V8ArrayBufferViewCustomScript.js:27 > var optimizeSetMethod = function(type) I'm not really familiar with this file. Is there someone you had in mind to review this patch? If not, I can study the code and try to review it. 529543 4 ulan 2012-01-04 08:32:09 -0800 Thanks Adam, I was hoping that Ken could review the patch since he reviewed my previous patches and is familiar with the code. (In reply to comment #3) > (From update of attachment 121106 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=121106&action=review > > > Source/WebCore/bindings/v8/custom/V8ArrayBufferViewCustomScript.js:27 > > var optimizeSetMethod = function(type) > > I'm not really familiar with this file. Is there someone you had in mind to review this patch? If not, I can study the code and try to review it. 529551 5 abarth 2012-01-04 09:06:45 -0800 In general writing this kind of patch script for JavaScript is impossible to get right. In your patch, for example, the new version of set will trigger a getter on the global object for Array (e.g., window.__defineGetter__("Array", function() {...}); ) Is there no way to avoid trying to patch the context with JavaScript? 529597 6 121106 kbr 2012-01-04 10:24:17 -0800 Comment on attachment 121106 More robust guard Thanks for the quick fix. The revised code looks fine, but for better robustness I think the following two lines should also be added above the call to "script->Run()" in installFastSet (V8ArrayBufferViewCustom.cpp): v8::TryCatch tryCatch; tryCatch.SetVerbose(true); Would those two lines have also worked around the problem? 529644 7 kbr 2012-01-04 11:33:44 -0800 (In reply to comment #5) > In general writing this kind of patch script for JavaScript is impossible to get right. In your patch, for example, the new version of set will trigger a getter on the global object for Array (e.g., window.__defineGetter__("Array", function() {...}); ) > > Is there no way to avoid trying to patch the context with JavaScript? I don't know whether it might be possible to implement more of this patching logic using the V8 API; however, having the JavaScript wrapper for the set() method is essential for performance. 530128 8 121246 ulan 2012-01-05 02:34:53 -0800 Created attachment 121246 Add TryCatch scope Thank you for the suggestion, Ken. Those two lines even without guards would indeed fix the issue. Adam, I had a solution that avoided patching, but it was several factors slower then the current solution because V8 couldn't inline it. 530399 9 121246 kbr 2012-01-05 10:29:38 -0800 Comment on attachment 121246 Add TryCatch scope Thanks, looks great. 530469 10 abarth 2012-01-05 11:27:01 -0800 Ok. Thanks. 530550 11 121246 webkit.review.bot 2012-01-05 12:41:32 -0800 Comment on attachment 121246 Add TryCatch scope Clearing flags on attachment: 121246 Committed r104196: <http://trac.webkit.org/changeset/104196> 530551 12 webkit.review.bot 2012-01-05 12:41:36 -0800 All reviewed patches have been landed. Closing bug. 121089 2012-01-04 02:35:16 -0800 2012-01-04 06:24:15 -0800 Make sure that V8ArrayBufferViewCustomScript.js does not throw exception. b75532 text/plain 4531 ulan SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDEwNDAy MykKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAx LTA0ICBVbGFuIERlZ2VuYmFldiAgPHVsYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFt2OF0g TnVsbCBwb2ludGVyIGV4Y2VwdGlvbiBpZiBhIHR5cGVkIGFycmF5IGNvbnN0cnVjdG9yIHNldCB0 byBhIHByaW1pdGl2ZSB2YWx1ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc1NTMyCisKKyAgICAgICAgTWFrZSBzdXJlIHRoYXQgVjhBcnJheUJ1ZmZl clZpZXdDdXN0b21TY3JpcHQuanMgZG9lcyBub3QgdGhyb3cgZXhjZXB0aW9uLgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTGF5b3V0VGVzdHMvZmFz dC9jYW52YXMvd2ViZ2wvYXJyYXktYnVmZmVyLXZpZXctY3Jhc2gtd2hlbi1yZWFzc2lnbmVkLWV4 cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2Vi Z2wvYXJyYXktYnVmZmVyLXZpZXctY3Jhc2gtd2hlbi1yZWFzc2lnbmVkLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVy Vmlld0N1c3RvbVNjcmlwdC5qczoKKwogMjAxMi0wMS0wNCAgTWFyeSBXdSAgPG1hcnkud3VAdG9y Y2htb2JpbGUuY29tLmNuPgogCiAgICAgICAgIEVuYWJsZSBET1dOTE9BRF9BVFRSSUJVVEUgaW4g QmxhY2tCZXJyeSBwb3J0aW5nCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhBcnJheUJ1ZmZlclZpZXdDdXN0b21TY3JpcHQuanMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tU2NyaXB0 LmpzCShyZXZpc2lvbiAxMDQwMTkpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhBcnJheUJ1ZmZlclZpZXdDdXN0b21TY3JpcHQuanMJKHdvcmtpbmcgY29weSkKQEAgLTI2 LDI0ICsyNiwyNyBAQAogCiB2YXIgb3B0aW1pemVTZXRNZXRob2QgPSBmdW5jdGlvbih0eXBlKQog ewotICAgIHR5cGUucHJvdG90eXBlLnNldCA9IChmdW5jdGlvbigpIHsKLSAgICAgICAgdmFyIG5h dGl2ZVNldCA9IHR5cGUucHJvdG90eXBlLnNldDsKLSAgICAgICAgdmFyIGYgPSBmdW5jdGlvbihz b3VyY2UsIG9mZnNldCkKLSAgICAgICAgewotICAgICAgICAgICAgaWYgKHNvdXJjZS5jb25zdHJ1 Y3RvciA9PT0gQXJyYXkpIHsKLSAgICAgICAgICAgICAgICB2YXIgbGVuZ3RoID0gc291cmNlLmxl bmd0aDsKLSAgICAgICAgICAgICAgICBvZmZzZXQgPSBvZmZzZXQgfHwgMDsKLSAgICAgICAgICAg ICAgICBpZiAob2Zmc2V0IDwgMCB8fCBvZmZzZXQgKyBsZW5ndGggPiB0aGlzLmxlbmd0aCkgewor ICAgIGlmICh0eXBlb2YgdHlwZSA9PT0gJ2Z1bmN0aW9uJyAmJiB0eXBlLmhhc093blByb3BlcnR5 KCdwcm90b3R5cGUnKSAmJiAKKyAgICAgICAgdHlwZW9mIHR5cGUucHJvdG90eXBlLnNldCA9PT0g J2Z1bmN0aW9uJykgeworICAgICAgICB0eXBlLnByb3RvdHlwZS5zZXQgPSAoZnVuY3Rpb24oKSB7 CisgICAgICAgICAgICB2YXIgbmF0aXZlU2V0ID0gdHlwZS5wcm90b3R5cGUuc2V0OworICAgICAg ICAgICAgdmFyIGYgPSBmdW5jdGlvbihzb3VyY2UsIG9mZnNldCkKKyAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICBpZiAoc291cmNlLmNvbnN0cnVjdG9yID09PSBBcnJheSkgeworICAgICAg ICAgICAgICAgICAgICB2YXIgbGVuZ3RoID0gc291cmNlLmxlbmd0aDsKKyAgICAgICAgICAgICAg ICAgICAgb2Zmc2V0ID0gb2Zmc2V0IHx8IDA7CisgICAgICAgICAgICAgICAgICAgIGlmIChvZmZz ZXQgPCAwIHx8IG9mZnNldCArIGxlbmd0aCA+IHRoaXMubGVuZ3RoKSB7CisgICAgICAgICAgICAg ICAgICAgICAgICByZXR1cm4gbmF0aXZlU2V0LmNhbGwodGhpcywgc291cmNlLCBvZmZzZXQpOwor ICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgbGVuZ3RoOyBpKyspCisgICAgICAgICAgICAgICAgICAgICAgICB0aGlzW2kgKyBvZmZz ZXRdID0gc291cmNlW2ldOworICAgICAgICAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgICAg ICAgICByZXR1cm4gbmF0aXZlU2V0LmNhbGwodGhpcywgc291cmNlLCBvZmZzZXQpOwotICAgICAg ICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxlbmd0aDsg aSsrKQotICAgICAgICAgICAgICAgICAgICB0aGlzW2kgKyBvZmZzZXRdID0gc291cmNlW2ldOwot ICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgcmV0dXJuIG5hdGl2ZVNldC5jYWxs KHRoaXMsIHNvdXJjZSwgb2Zmc2V0KTsKLSAgICAgICAgfQotICAgICAgICBmLm5hbWUgPSAic2V0 IjsKLSAgICAgICAgcmV0dXJuIGY7Ci0gICAgfSkoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIGYubmFtZSA9ICJzZXQiOworICAgICAgICAgICAgcmV0dXJuIGY7CisgICAgICAgIH0pKCk7 CisgICAgfQogfTsKIAogb3B0aW1pemVTZXRNZXRob2QoRmxvYXQzMkFycmF5KTsKSW5kZXg6IExh eW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL2FycmF5LWJ1ZmZlci12aWV3LWNyYXNoLXdoZW4t cmVhc3NpZ25lZC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9j YW52YXMvd2ViZ2wvYXJyYXktYnVmZmVyLXZpZXctY3Jhc2gtd2hlbi1yZWFzc2lnbmVkLWV4cGVj dGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL2Fy cmF5LWJ1ZmZlci12aWV3LWNyYXNoLXdoZW4tcmVhc3NpZ25lZC1leHBlY3RlZC50eHQJKHJldmlz aW9uIDApCkBAIC0wLDAgKzEsOSBAQAorVmVyaWZ5IHRoYXQgcmVhc3NpZ25pbmcgdHlwZWQgYXJy YXkgY29uc3RydWN0b3IgZG9lcyBub3QgY3Jhc2guCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNl ZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRF Ii4KKworUEFTUyByZWFzc2lnbmluZyB0eXBlZCBhcnJheSBjb25zdHJ1Y3RvciBkaWQgbm90IGNy YXNoCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJ bmRleDogTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvYXJyYXktYnVmZmVyLXZpZXctY3Jh c2gtd2hlbi1yZWFzc2lnbmVkLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9j YW52YXMvd2ViZ2wvYXJyYXktYnVmZmVyLXZpZXctY3Jhc2gtd2hlbi1yZWFzc2lnbmVkLmh0bWwJ KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9hcnJheS1idWZm ZXItdmlldy1jcmFzaC13aGVuLXJlYXNzaWduZWQuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCAr MSwzMiBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9qcy9yZXNvdXJjZXMv anMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9InJlc291cmNlcy93ZWJnbC10 ZXN0LmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPGRpdiBpZD0iZGVzY3JpcHRpb24i PjwvZGl2PgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CisKKzxzY3JpcHQ+CisKK2Rlc2NyaXB0 aW9uKCdWZXJpZnkgdGhhdCByZWFzc2lnbmluZyB0eXBlZCBhcnJheSBjb25zdHJ1Y3RvciBkb2Vz IG5vdCBjcmFzaC4nKTsKKworPCEtLSBUaGUgZm9sbG93aW5nIHVzZWQgdG8gY2F1c2UgYSBjcmFz aCBDaHJvbWUgLS0+CitVaW50OEFycmF5ID0gMDsKK1VpbnQxNkFycmF5ID0gInN0cmluZyI7CitV aW50MzJBcnJheSA9IGZ1bmN0aW9uKCkge307CitJbnQxNkFycmF5ID0gZnVuY3Rpb24oKSB7fTsK K0ludDE2QXJyYXkucHJvdG90eXBlLnNldCA9IDA7CituZXcgRmxvYXQ2NEFycmF5KGZ1bmN0aW9u ICgpIHt9KTsKK25ldyBGbG9hdDMyQXJyYXkoWzEsIDIsIDNdLCAxKTsKK25ldyBJbnQxNkFycmF5 KGZ1bmN0aW9uKCkge30pOwordGVzdFBhc3NlZCgicmVhc3NpZ25pbmcgdHlwZWQgYXJyYXkgY29u c3RydWN0b3IgZGlkIG5vdCBjcmFzaCIpOworCis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8u Li9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKworPHNjcmlwdD4KKzwv c2NyaXB0PgorCis8L2JvZHk+Cis8L2h0bWw+Cg== 121106 2012-01-04 06:24:15 -0800 2012-01-05 02:34:53 -0800 More robust guard b75532-1 text/plain 4545 ulan SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDEwNDAy MykKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAx LTA0ICBVbGFuIERlZ2VuYmFldiAgPHVsYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFt2OF0g TnVsbCBwb2ludGVyIGV4Y2VwdGlvbiBpZiBhIHR5cGVkIGFycmF5IGNvbnN0cnVjdG9yIHNldCB0 byBhIHByaW1pdGl2ZSB2YWx1ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc1NTMyCisKKyAgICAgICAgTWFrZSBzdXJlIHRoYXQgVjhBcnJheUJ1ZmZl clZpZXdDdXN0b21TY3JpcHQuanMgZG9lcyBub3QgdGhyb3cgZXhjZXB0aW9uLgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTGF5b3V0VGVzdHMvZmFz dC9jYW52YXMvd2ViZ2wvYXJyYXktYnVmZmVyLXZpZXctY3Jhc2gtd2hlbi1yZWFzc2lnbmVkLWV4 cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2Vi Z2wvYXJyYXktYnVmZmVyLXZpZXctY3Jhc2gtd2hlbi1yZWFzc2lnbmVkLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVy Vmlld0N1c3RvbVNjcmlwdC5qczoKKwogMjAxMi0wMS0wNCAgTWFyeSBXdSAgPG1hcnkud3VAdG9y Y2htb2JpbGUuY29tLmNuPgogCiAgICAgICAgIEVuYWJsZSBET1dOTE9BRF9BVFRSSUJVVEUgaW4g QmxhY2tCZXJyeSBwb3J0aW5nCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhBcnJheUJ1ZmZlclZpZXdDdXN0b21TY3JpcHQuanMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tU2NyaXB0 LmpzCShyZXZpc2lvbiAxMDQwMTkpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhBcnJheUJ1ZmZlclZpZXdDdXN0b21TY3JpcHQuanMJKHdvcmtpbmcgY29weSkKQEAgLTI2 LDI0ICsyNiwyOCBAQAogCiB2YXIgb3B0aW1pemVTZXRNZXRob2QgPSBmdW5jdGlvbih0eXBlKQog ewotICAgIHR5cGUucHJvdG90eXBlLnNldCA9IChmdW5jdGlvbigpIHsKLSAgICAgICAgdmFyIG5h dGl2ZVNldCA9IHR5cGUucHJvdG90eXBlLnNldDsKLSAgICAgICAgdmFyIGYgPSBmdW5jdGlvbihz b3VyY2UsIG9mZnNldCkKLSAgICAgICAgewotICAgICAgICAgICAgaWYgKHNvdXJjZS5jb25zdHJ1 Y3RvciA9PT0gQXJyYXkpIHsKLSAgICAgICAgICAgICAgICB2YXIgbGVuZ3RoID0gc291cmNlLmxl bmd0aDsKLSAgICAgICAgICAgICAgICBvZmZzZXQgPSBvZmZzZXQgfHwgMDsKLSAgICAgICAgICAg ICAgICBpZiAob2Zmc2V0IDwgMCB8fCBvZmZzZXQgKyBsZW5ndGggPiB0aGlzLmxlbmd0aCkgewor ICAgIGlmICh0eXBlb2YgdHlwZSA9PT0gJ2Z1bmN0aW9uJyAmJgorICAgICAgICB0eXBlb2YgdHlw ZS5wcm90b3R5cGUgIT09ICd1bmRlZmluZWQnICYmIAorICAgICAgICB0eXBlb2YgdHlwZS5wcm90 b3R5cGUuc2V0ID09PSAnZnVuY3Rpb24nKSB7CisgICAgICAgIHR5cGUucHJvdG90eXBlLnNldCA9 IChmdW5jdGlvbigpIHsKKyAgICAgICAgICAgIHZhciBuYXRpdmVTZXQgPSB0eXBlLnByb3RvdHlw ZS5zZXQ7CisgICAgICAgICAgICB2YXIgZiA9IGZ1bmN0aW9uKHNvdXJjZSwgb2Zmc2V0KQorICAg ICAgICAgICAgeworICAgICAgICAgICAgICAgIGlmIChzb3VyY2UuY29uc3RydWN0b3IgPT09IEFy cmF5KSB7CisgICAgICAgICAgICAgICAgICAgIHZhciBsZW5ndGggPSBzb3VyY2UubGVuZ3RoOwor ICAgICAgICAgICAgICAgICAgICBvZmZzZXQgPSBvZmZzZXQgfHwgMDsKKyAgICAgICAgICAgICAg ICAgICAgaWYgKG9mZnNldCA8IDAgfHwgb2Zmc2V0ICsgbGVuZ3RoID4gdGhpcy5sZW5ndGgpIHsK KyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBuYXRpdmVTZXQuY2FsbCh0aGlzLCBzb3Vy Y2UsIG9mZnNldCk7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCBsZW5ndGg7IGkrKykKKyAgICAgICAgICAgICAgICAgICAgICAg IHRoaXNbaSArIG9mZnNldF0gPSBzb3VyY2VbaV07CisgICAgICAgICAgICAgICAgfSBlbHNlCiAg ICAgICAgICAgICAgICAgICAgIHJldHVybiBuYXRpdmVTZXQuY2FsbCh0aGlzLCBzb3VyY2UsIG9m ZnNldCk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgbGVuZ3RoOyBpKyspCi0gICAgICAgICAgICAgICAgICAgIHRoaXNbaSArIG9mZnNldF0g PSBzb3VyY2VbaV07Ci0gICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICByZXR1cm4g bmF0aXZlU2V0LmNhbGwodGhpcywgc291cmNlLCBvZmZzZXQpOwotICAgICAgICB9Ci0gICAgICAg IGYubmFtZSA9ICJzZXQiOwotICAgICAgICByZXR1cm4gZjsKLSAgICB9KSgpOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgZi5uYW1lID0gInNldCI7CisgICAgICAgICAgICByZXR1cm4gZjsK KyAgICAgICAgfSkoKTsKKyAgICB9CiB9OwogCiBvcHRpbWl6ZVNldE1ldGhvZChGbG9hdDMyQXJy YXkpOwpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvYXJyYXktYnVmZmVyLXZp ZXctY3Jhc2gtd2hlbi1yZWFzc2lnbmVkLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9hcnJheS1idWZmZXItdmlldy1jcmFzaC13aGVuLXJl YXNzaWduZWQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9j YW52YXMvd2ViZ2wvYXJyYXktYnVmZmVyLXZpZXctY3Jhc2gtd2hlbi1yZWFzc2lnbmVkLWV4cGVj dGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw5IEBACitWZXJpZnkgdGhhdCByZWFzc2ln bmluZyB0eXBlZCBhcnJheSBjb25zdHJ1Y3RvciBkb2VzIG5vdCBjcmFzaC4KKworT24gc3VjY2Vz cywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkg IlRFU1QgQ09NUExFVEUiLgorCitQQVNTIHJlYXNzaWduaW5nIHR5cGVkIGFycmF5IGNvbnN0cnVj dG9yIGRpZCBub3QgY3Jhc2gKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVT VCBDT01QTEVURQorCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9hcnJheS1i dWZmZXItdmlldy1jcmFzaC13aGVuLXJlYXNzaWduZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9hcnJheS1idWZmZXItdmlldy1jcmFzaC13aGVuLXJl YXNzaWduZWQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dl YmdsL2FycmF5LWJ1ZmZlci12aWV3LWNyYXNoLXdoZW4tcmVhc3NpZ25lZC5odG1sCShyZXZpc2lv biAwKQpAQCAtMCwwICsxLDMyIEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4u L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0icmVz b3VyY2VzL3dlYmdsLXRlc3QuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IGlk PSJkZXNjcmlwdGlvbiI+PC9kaXY+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKworPHNjcmlw dD4KKworZGVzY3JpcHRpb24oJ1ZlcmlmeSB0aGF0IHJlYXNzaWduaW5nIHR5cGVkIGFycmF5IGNv bnN0cnVjdG9yIGRvZXMgbm90IGNyYXNoLicpOworCis8IS0tIFRoZSBmb2xsb3dpbmcgdXNlZCB0 byBjYXVzZSBhIGNyYXNoIENocm9tZSAtLT4KK1VpbnQ4QXJyYXkgPSAwOworVWludDE2QXJyYXkg PSAic3RyaW5nIjsKK1VpbnQzMkFycmF5ID0gZnVuY3Rpb24oKSB7fTsKK0ludDE2QXJyYXkgPSBm dW5jdGlvbigpIHt9OworSW50MTZBcnJheS5wcm90b3R5cGUuc2V0ID0gMDsKK25ldyBGbG9hdDY0 QXJyYXkoZnVuY3Rpb24gKCkge30pOworbmV3IEZsb2F0MzJBcnJheShbMSwgMiwgM10sIDEpOwor bmV3IEludDE2QXJyYXkoZnVuY3Rpb24oKSB7fSk7Cit0ZXN0UGFzc2VkKCJyZWFzc2lnbmluZyB0 eXBlZCBhcnJheSBjb25zdHJ1Y3RvciBkaWQgbm90IGNyYXNoIik7CisKKzwvc2NyaXB0PgorPHNj cmlwdCBzcmM9Ii4uLy4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0Pgor Cis8c2NyaXB0PgorPC9zY3JpcHQ+CisKKzwvYm9keT4KKzwvaHRtbD4K 121246 2012-01-05 02:34:53 -0800 2012-01-05 12:41:32 -0800 Add TryCatch scope b75532-2 text/plain 5319 ulan SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDEwNDEy OCkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAx LTA1ICBVbGFuIERlZ2VuYmFldiAgPHVsYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFt2OF0g TnVsbCBwb2ludGVyIGV4Y2VwdGlvbiBpZiBhIHR5cGVkIGFycmF5IGNvbnN0cnVjdG9yIHNldCB0 byBhIHByaW1pdGl2ZSB2YWx1ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc1NTMyCisKKyAgICAgICAgTWFrZSBzdXJlIHRoYXQgVjhBcnJheUJ1ZmZl clZpZXdDdXN0b21TY3JpcHQuanMgZG9lcyBub3QgdGhyb3cgZXhjZXB0aW9uLgorCisgICAgICAg IFJldmlld2VkIGJ5IEtlbm5ldGggUnVzc2VsbC4KKworICAgICAgICAqIExheW91dFRlc3RzL2Zh c3QvY2FudmFzL3dlYmdsL2FycmF5LWJ1ZmZlci12aWV3LWNyYXNoLXdoZW4tcmVhc3NpZ25lZC1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dl YmdsL2FycmF5LWJ1ZmZlci12aWV3LWNyYXNoLXdoZW4tcmVhc3NpZ25lZC5odG1sOiBBZGRlZC4K KyAgICAgICAgKiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhBcnJheUJ1ZmZl clZpZXdDdXN0b20uY3BwOgorICAgICAgICAqIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbVNjcmlwdC5qczoKKwogMjAxMi0wMS0wNCAgSmFt ZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0g TW92ZSBXZWJNaW1lUmVnaXN0cnkgYW5kIGRlcGVuZGVuY2llcyB0byBTb3VyY2UvUGxhdGZvcm0K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVyVmll d0N1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tLmNwcAkocmV2aXNpb24gMTA0MDE5KQorKysgU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNDcsNiArNDcsOCBAQCBib29sIGZhc3RTZXRJbnN0YWxsZWQo djg6OkhhbmRsZTx2ODo6T2JqCiAKIHZvaWQgaW5zdGFsbEZhc3RTZXQodjg6OkhhbmRsZTx2ODo6 T2JqZWN0PiBhcnJheSkKIHsKKyAgICB2ODo6VHJ5Q2F0Y2ggdHJ5Q2F0Y2g7CisgICAgdHJ5Q2F0 Y2guU2V0VmVyYm9zZSh0cnVlKTsKICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGdsb2JhbCA9 IGFycmF5LT5DcmVhdGlvbkNvbnRleHQoKS0+R2xvYmFsKCk7CiAgICAgdjg6OkhhbmRsZTx2ODo6 U3RyaW5nPiBrZXkgPSB2ODo6U3RyaW5nOjpOZXcoZmFzdFNldEZsYWdOYW1lKTsKICAgICBnbG9i YWwtPlNldEhpZGRlblZhbHVlKGtleSwgdjg6OkJvb2xlYW46Ok5ldyh0cnVlKSk7CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhBcnJheUJ1ZmZlclZpZXdDdXN0b21T Y3JpcHQuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tU2NyaXB0LmpzCShyZXZpc2lvbiAxMDQwMTkpCisrKyBT b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhBcnJheUJ1ZmZlclZpZXdDdXN0b21T Y3JpcHQuanMJKHdvcmtpbmcgY29weSkKQEAgLTI2LDI0ICsyNiwyOCBAQAogCiB2YXIgb3B0aW1p emVTZXRNZXRob2QgPSBmdW5jdGlvbih0eXBlKQogewotICAgIHR5cGUucHJvdG90eXBlLnNldCA9 IChmdW5jdGlvbigpIHsKLSAgICAgICAgdmFyIG5hdGl2ZVNldCA9IHR5cGUucHJvdG90eXBlLnNl dDsKLSAgICAgICAgdmFyIGYgPSBmdW5jdGlvbihzb3VyY2UsIG9mZnNldCkKLSAgICAgICAgewot ICAgICAgICAgICAgaWYgKHNvdXJjZS5jb25zdHJ1Y3RvciA9PT0gQXJyYXkpIHsKLSAgICAgICAg ICAgICAgICB2YXIgbGVuZ3RoID0gc291cmNlLmxlbmd0aDsKLSAgICAgICAgICAgICAgICBvZmZz ZXQgPSBvZmZzZXQgfHwgMDsKLSAgICAgICAgICAgICAgICBpZiAob2Zmc2V0IDwgMCB8fCBvZmZz ZXQgKyBsZW5ndGggPiB0aGlzLmxlbmd0aCkgeworICAgIGlmICh0eXBlb2YgdHlwZSA9PT0gJ2Z1 bmN0aW9uJyAmJgorICAgICAgICB0eXBlb2YgdHlwZS5wcm90b3R5cGUgIT09ICd1bmRlZmluZWQn ICYmIAorICAgICAgICB0eXBlb2YgdHlwZS5wcm90b3R5cGUuc2V0ID09PSAnZnVuY3Rpb24nKSB7 CisgICAgICAgIHR5cGUucHJvdG90eXBlLnNldCA9IChmdW5jdGlvbigpIHsKKyAgICAgICAgICAg IHZhciBuYXRpdmVTZXQgPSB0eXBlLnByb3RvdHlwZS5zZXQ7CisgICAgICAgICAgICB2YXIgZiA9 IGZ1bmN0aW9uKHNvdXJjZSwgb2Zmc2V0KQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAg IGlmIChzb3VyY2UuY29uc3RydWN0b3IgPT09IEFycmF5KSB7CisgICAgICAgICAgICAgICAgICAg IHZhciBsZW5ndGggPSBzb3VyY2UubGVuZ3RoOworICAgICAgICAgICAgICAgICAgICBvZmZzZXQg PSBvZmZzZXQgfHwgMDsKKyAgICAgICAgICAgICAgICAgICAgaWYgKG9mZnNldCA8IDAgfHwgb2Zm c2V0ICsgbGVuZ3RoID4gdGhpcy5sZW5ndGgpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJl dHVybiBuYXRpdmVTZXQuY2FsbCh0aGlzLCBzb3VyY2UsIG9mZnNldCk7CisgICAgICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBsZW5ndGg7 IGkrKykKKyAgICAgICAgICAgICAgICAgICAgICAgIHRoaXNbaSArIG9mZnNldF0gPSBzb3VyY2Vb aV07CisgICAgICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBu YXRpdmVTZXQuY2FsbCh0aGlzLCBzb3VyY2UsIG9mZnNldCk7Ci0gICAgICAgICAgICAgICAgfQot ICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbGVuZ3RoOyBpKyspCi0gICAgICAg ICAgICAgICAgICAgIHRoaXNbaSArIG9mZnNldF0gPSBzb3VyY2VbaV07Ci0gICAgICAgICAgICB9 IGVsc2UKLSAgICAgICAgICAgICAgICByZXR1cm4gbmF0aXZlU2V0LmNhbGwodGhpcywgc291cmNl LCBvZmZzZXQpOwotICAgICAgICB9Ci0gICAgICAgIGYubmFtZSA9ICJzZXQiOwotICAgICAgICBy ZXR1cm4gZjsKLSAgICB9KSgpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgZi5uYW1lID0g InNldCI7CisgICAgICAgICAgICByZXR1cm4gZjsKKyAgICAgICAgfSkoKTsKKyAgICB9CiB9Owog CiBvcHRpbWl6ZVNldE1ldGhvZChGbG9hdDMyQXJyYXkpOwpJbmRleDogTGF5b3V0VGVzdHMvZmFz dC9jYW52YXMvd2ViZ2wvYXJyYXktYnVmZmVyLXZpZXctY3Jhc2gtd2hlbi1yZWFzc2lnbmVkLWV4 cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9h cnJheS1idWZmZXItdmlldy1jcmFzaC13aGVuLXJlYXNzaWduZWQtZXhwZWN0ZWQudHh0CShyZXZp c2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvYXJyYXktYnVmZmVyLXZp ZXctY3Jhc2gtd2hlbi1yZWFzc2lnbmVkLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAs MCArMSw5IEBACitWZXJpZnkgdGhhdCByZWFzc2lnbmluZyB0eXBlZCBhcnJheSBjb25zdHJ1Y3Rv ciBkb2VzIG5vdCBjcmFzaC4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9m ICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCitQQVNTIHJl YXNzaWduaW5nIHR5cGVkIGFycmF5IGNvbnN0cnVjdG9yIGRpZCBub3QgY3Jhc2gKK1BBU1Mgc3Vj Y2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCkluZGV4OiBMYXlvdXRU ZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9hcnJheS1idWZmZXItdmlldy1jcmFzaC13aGVuLXJlYXNz aWduZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9h cnJheS1idWZmZXItdmlldy1jcmFzaC13aGVuLXJlYXNzaWduZWQuaHRtbAkocmV2aXNpb24gMCkK KysrIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL2FycmF5LWJ1ZmZlci12aWV3LWNyYXNo LXdoZW4tcmVhc3NpZ25lZC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDMyIEBACis8aHRt bD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5q cyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0icmVzb3VyY2VzL3dlYmdsLXRlc3QuanMiPjwvc2Ny aXB0PgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IGlkPSJkZXNjcmlwdGlvbiI+PC9kaXY+Cis8ZGl2 IGlkPSJjb25zb2xlIj48L2Rpdj4KKworPHNjcmlwdD4KKworZGVzY3JpcHRpb24oJ1ZlcmlmeSB0 aGF0IHJlYXNzaWduaW5nIHR5cGVkIGFycmF5IGNvbnN0cnVjdG9yIGRvZXMgbm90IGNyYXNoLicp OworCis8IS0tIFRoZSBmb2xsb3dpbmcgdXNlZCB0byBjYXVzZSBhIGNyYXNoIGluIENocm9tZSAt LT4KK1VpbnQ4QXJyYXkgPSAwOworVWludDE2QXJyYXkgPSAic3RyaW5nIjsKK1VpbnQzMkFycmF5 ID0gZnVuY3Rpb24oKSB7fTsKK0ludDE2QXJyYXkgPSBmdW5jdGlvbigpIHt9OworSW50MTZBcnJh eS5wcm90b3R5cGUuc2V0ID0gMDsKK25ldyBGbG9hdDY0QXJyYXkoZnVuY3Rpb24gKCkge30pOwor bmV3IEZsb2F0MzJBcnJheShbMSwgMiwgM10sIDEpOworbmV3IEludDE2QXJyYXkoZnVuY3Rpb24o KSB7fSk7Cit0ZXN0UGFzc2VkKCJyZWFzc2lnbmluZyB0eXBlZCBhcnJheSBjb25zdHJ1Y3RvciBk aWQgbm90IGNyYXNoIik7CisKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uL2pzL3Jlc291 cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorCis8c2NyaXB0PgorPC9zY3JpcHQ+CisK KzwvYm9keT4KKzwvaHRtbD4K