101754 2012-11-09 06:24:16 -0800 Move resolving blob references to FormData 2012-11-12 11:13:48 -0800 1 1 1 Unclassified WebKit Platform 420+ Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 allan.jensen allan.jensen jturcotte mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 762949 0 allan.jensen 2012-11-09 06:24:16 -0800 Several platforms have a similar logic for resolving the blob references in HTTP post request, this code could be shared between the platforms by moving it from the platforms and into FormData. 762957 1 173295 allan.jensen 2012-11-09 06:34:09 -0800 Created attachment 173295 Patch 764591 2 173295 webkit.review.bot 2012-11-12 11:13:44 -0800 Comment on attachment 173295 Patch Clearing flags on attachment: 173295 Committed r134262: <http://trac.webkit.org/changeset/134262> 764592 3 webkit.review.bot 2012-11-12 11:13:48 -0800 All reviewed patches have been landed. Closing bug. 173295 2012-11-09 06:34:09 -0800 2012-11-12 11:13:44 -0800 Patch bug-101754-20121109153152.patch text/plain 15144 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTM5Yzc1NWI3NGFmZTcy OWFkMzVhYWIyMDIwMDkzYWVmZjcxMjNiZi4uNWI4ZDNlNmM4NDczOGQyODU5NWZmYTQxZGE2YzFh ZmFjNzBiMzgwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTExLTA5ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIE1v dmUgcmVzb2x2aW5nIGJsb2IgcmVmZXJlbmNlcyB0byBGb3JtRGF0YS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTc1NAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlc29sdmluZyBCbG9iLXJlZmVyZW5j ZXMgdG8gYSBzZXQgb2YganVzdCBGaWxlIGFuZCBEYXRhIGlzIGRvbmUgc2ltaWxhciBieSBzZXZl cmFsIHBsYXRmb3Jtcy4KKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIGEgZ2VuZXJpYyBpbXBsZW1l bnRhdGlvbiBpbiBGb3JtRGF0YSBhbmQgdXNlcyB0aGF0IGZyb20gQ0ZOZXR3b3JrLCBRdCBhbmQK KyAgICAgICAgQmxhY2tCZXJyeSBuZXR3b3JrIGltcGxlbWVudGF0aW9uLgorCisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5jcHA6CisgICAgICAgIChXZWJDb3JlOjphcHBlbmRC bG9iUmVzb2x2ZWQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9ybURhdGE6OnJlc29sdmVCbG9iUmVm ZXJlbmNlcyk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5oOgorICAgICAg ICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3RCbGFja0JlcnJ5 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6aW5pdGlhbGl6ZVBsYXRm b3JtUmVxdWVzdCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jZi9Gb3JtRGF0YVN0cmVh bUNGTmV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNldEhUVFBCb2R5KToKKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZvcm1EYXRhSU9EZXZpY2U6OnByZXBhcmVGb3JtRWxlbWVudHMpOgorCiAyMDEyLTEx LTA5ICBLZWlzaGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgogCiAgICAgICAgIE1vbnRo L3dlZWsgcGlja2VyIHNob3VsZCBzdWJtaXQgbW9udGgvd2VlayBzdHJpbmcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5jcHAKaW5kZXggNDNhNzFhZjFhNzFmYjZm ZGNjZDMwYmE4YzdlNWE1MTE2MTExNmFlZS4uMzNlZGNmNDE0YzAzNGRjZjQ0MDdmMzA1ZjllYTlk ZDJlNTE5ZTExMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9G b3JtRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0 YS5jcHAKQEAgLTEsNiArMSw3IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDA0LCAyMDA2LCAy MDA4LCAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAo QykgMjAwOSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChD KSAyMDEyIERpZ2lhIFBsYy4gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1pZXMpCiAgKgogICogVGhp cyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9v cgogICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJh bCBQdWJsaWMKQEAgLTIzLDYgKzI0LDcgQEAKICNpbmNsdWRlICJGb3JtRGF0YS5oIgogCiAjaW5j bHVkZSAiQmxvYkRhdGEuaCIKKyNpbmNsdWRlICJCbG9iUmVnaXN0cnlJbXBsLmgiCiAjaW5jbHVk ZSAiQmxvYlVSTC5oIgogI2luY2x1ZGUgIkNocm9tZS5oIgogI2luY2x1ZGUgIkNocm9tZUNsaWVu dC5oIgpAQCAtMzE3LDYgKzMxOSw2NCBAQCBTdHJpbmcgRm9ybURhdGE6OmZsYXR0ZW5Ub1N0cmlu ZygpIGNvbnN0CiAgICAgcmV0dXJuIExhdGluMUVuY29kaW5nKCkuZGVjb2RlKHJlaW50ZXJwcmV0 X2Nhc3Q8Y29uc3QgY2hhcio+KGJ5dGVzLmRhdGEoKSksIGJ5dGVzLnNpemUoKSk7CiB9CiAKKyNp ZiBFTkFCTEUoQkxPQikKK3N0YXRpYyB2b2lkIGFwcGVuZEJsb2JSZXNvbHZlZChGb3JtRGF0YSog Zm9ybURhdGEsIGNvbnN0IEtVUkwmIHVybCkKK3sKKyAgICBSZWZQdHI8QmxvYlN0b3JhZ2VEYXRh PiBibG9iRGF0YSA9IHN0YXRpY19jYXN0PEJsb2JSZWdpc3RyeUltcGwmPihibG9iUmVnaXN0cnko KSkuZ2V0QmxvYkRhdGFGcm9tVVJMKEtVUkwoUGFyc2VkVVJMU3RyaW5nLCB1cmwpKTsKKyAgICBp ZiAoIWJsb2JEYXRhKQorICAgICAgICByZXR1cm47CisKKyAgICBCbG9iRGF0YUl0ZW1MaXN0Ojpj b25zdF9pdGVyYXRvciBpdCA9IGJsb2JEYXRhLT5pdGVtcygpLmJlZ2luKCk7CisgICAgY29uc3Qg QmxvYkRhdGFJdGVtTGlzdDo6Y29uc3RfaXRlcmF0b3IgaXRlbmQgPSBibG9iRGF0YS0+aXRlbXMo KS5lbmQoKTsKKyAgICBmb3IgKDsgaXQgIT0gaXRlbmQ7ICsraXQpIHsKKyAgICAgICAgY29uc3Qg QmxvYkRhdGFJdGVtJiBibG9iSXRlbSA9ICppdDsKKyAgICAgICAgaWYgKGJsb2JJdGVtLnR5cGUg PT0gQmxvYkRhdGFJdGVtOjpEYXRhKQorICAgICAgICAgICAgZm9ybURhdGEtPmFwcGVuZERhdGEo YmxvYkl0ZW0uZGF0YS0+ZGF0YSgpICsgc3RhdGljX2Nhc3Q8aW50PihibG9iSXRlbS5vZmZzZXQp LCBzdGF0aWNfY2FzdDxpbnQ+KGJsb2JJdGVtLmxlbmd0aCkpOworICAgICAgICBlbHNlIGlmIChi bG9iSXRlbS50eXBlID09IEJsb2JEYXRhSXRlbTo6RmlsZSkKKyAgICAgICAgICAgIGZvcm1EYXRh LT5hcHBlbmRGaWxlUmFuZ2UoYmxvYkl0ZW0ucGF0aCwgYmxvYkl0ZW0ub2Zmc2V0LCBibG9iSXRl bS5sZW5ndGgsIGJsb2JJdGVtLmV4cGVjdGVkTW9kaWZpY2F0aW9uVGltZSk7CisgICAgICAgIGVs c2UgaWYgKGJsb2JJdGVtLnR5cGUgPT0gQmxvYkRhdGFJdGVtOjpCbG9iKQorICAgICAgICAgICAg YXBwZW5kQmxvYlJlc29sdmVkKGZvcm1EYXRhLCBibG9iSXRlbS51cmwpOworICAgICAgICBlbHNl CisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICB9Cit9CisKK1Bhc3NSZWZQ dHI8Rm9ybURhdGE+IEZvcm1EYXRhOjpyZXNvbHZlQmxvYlJlZmVyZW5jZXMoKQoreworICAgIC8v IEZpcnN0IGNoZWNrIGlmIGFueSBibG9icyBuZWVkcyB0byBiZSByZXNvbHZlZCwgb3Igd2UgY2Fu IHRha2UgdGhlIGZhc3QgcGF0aC4KKyAgICBib29sIGhhc0Jsb2IgPSBmYWxzZTsKKyAgICBWZWN0 b3I8Rm9ybURhdGFFbGVtZW50Pjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBlbGVtZW50cygpLmJlZ2lu KCk7CisgICAgY29uc3QgVmVjdG9yPEZvcm1EYXRhRWxlbWVudD46OmNvbnN0X2l0ZXJhdG9yIGl0 ZW5kID0gZWxlbWVudHMoKS5lbmQoKTsKKyAgICBmb3IgKDsgaXQgIT0gaXRlbmQ7ICsraXQpIHsK KyAgICAgICAgaWYgKGl0LT5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjplbmNvZGVkQmxvYikg eworICAgICAgICAgICAgaGFzQmxvYiA9IHRydWU7CisgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgfQorICAgIH0KKworICAgIGlmICghaGFzQmxvYikKKyAgICAgICAgcmV0dXJuIHRoaXM7CisK KyAgICAvLyBDcmVhdGUgYSBjb3B5IHRvIGFwcGVuZCB0aGUgcmVzdWx0IGludG8uCisgICAgUmVm UHRyPEZvcm1EYXRhPiBuZXdGb3JtRGF0YSA9IEZvcm1EYXRhOjpjcmVhdGUoKTsKKyAgICBuZXdG b3JtRGF0YS0+c2V0QWx3YXlzU3RyZWFtKGFsd2F5c1N0cmVhbSgpKTsKKyAgICBuZXdGb3JtRGF0 YS0+c2V0SWRlbnRpZmllcihpZGVudGlmaWVyKCkpOworICAgIGl0ID0gZWxlbWVudHMoKS5iZWdp bigpOworICAgIGZvciAoOyBpdCAhPSBpdGVuZDsgKytpdCkgeworICAgICAgICBjb25zdCBGb3Jt RGF0YUVsZW1lbnQmIGVsZW1lbnQgPSAqaXQ7CisgICAgICAgIGlmIChlbGVtZW50Lm1fdHlwZSA9 PSBGb3JtRGF0YUVsZW1lbnQ6OmRhdGEpCisgICAgICAgICAgICBuZXdGb3JtRGF0YS0+YXBwZW5k RGF0YShlbGVtZW50Lm1fZGF0YS5kYXRhKCksIGVsZW1lbnQubV9kYXRhLnNpemUoKSk7CisgICAg ICAgIGVsc2UgaWYgKGVsZW1lbnQubV90eXBlID09IEZvcm1EYXRhRWxlbWVudDo6ZW5jb2RlZEZp bGUpCisgICAgICAgICAgICBuZXdGb3JtRGF0YS0+YXBwZW5kRmlsZVJhbmdlKGVsZW1lbnQubV9m aWxlbmFtZSwgZWxlbWVudC5tX2ZpbGVTdGFydCwgZWxlbWVudC5tX2ZpbGVMZW5ndGgsIGVsZW1l bnQubV9leHBlY3RlZEZpbGVNb2RpZmljYXRpb25UaW1lLCBlbGVtZW50Lm1fc2hvdWxkR2VuZXJh dGVGaWxlKTsKKyAgICAgICAgZWxzZSBpZiAoZWxlbWVudC5tX3R5cGUgPT0gRm9ybURhdGFFbGVt ZW50OjplbmNvZGVkQmxvYikKKyAgICAgICAgICAgIGFwcGVuZEJsb2JSZXNvbHZlZChuZXdGb3Jt RGF0YS5nZXQoKSwgZWxlbWVudC5tX3VybCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIH0KKyAgICByZXR1cm4gbmV3Rm9ybURhdGEucmVsZWFz ZSgpOworfQorI2VuZGlmCisKIHZvaWQgRm9ybURhdGE6OmdlbmVyYXRlRmlsZXMoRG9jdW1lbnQq IGRvY3VtZW50KQogewogICAgIEFTU0VSVCghbV9oYXNHZW5lcmF0ZWRGaWxlcyk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmgKaW5kZXggNDFkZTU4ODA1MjIyMTkw ZmVhYWNlMzEwNDM3MjIzNjRiZGIwZjdmZC4uMTJjYTc4YTYzMWIwMjY2MmRkNTIwODAxZGY3YTQ4 YjY0OTYyZDMwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9G b3JtRGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEu aApAQCAtMTM0LDYgKzEzNCwxMiBAQCBwdWJsaWM6CiAgICAgdm9pZCBmbGF0dGVuKFZlY3Rvcjxj aGFyPiYpIGNvbnN0OyAvLyBvbWl0cyBmaWxlcwogICAgIFN0cmluZyBmbGF0dGVuVG9TdHJpbmco KSBjb25zdDsgLy8gb21pdHMgZmlsZXMKIAorI2lmIEVOQUJMRShCTE9CKQorICAgIC8vIFJlc29s dmUgYWxsIGJsb2IgcmVmZXJlbmNlcyBzbyB3ZSBvbmx5IGhhdmUgZmlsZSBhbmQgZGF0YS4KKyAg ICAvLyBJZiB0aGUgRm9ybURhdGEgaGFzIG5vIGJsb2IgcmVmZXJlbmNlcyB0byByZXNvbHZlLCB0 aGlzIGlzIHJldHVybmVkLgorICAgIFBhc3NSZWZQdHI8Rm9ybURhdGE+IHJlc29sdmVCbG9iUmVm ZXJlbmNlcygpOworI2VuZGlmCisKICAgICBib29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVybiBt X2VsZW1lbnRzLmlzRW1wdHkoKTsgfQogICAgIGNvbnN0IFZlY3RvcjxGb3JtRGF0YUVsZW1lbnQ+ JiBlbGVtZW50cygpIGNvbnN0IHsgcmV0dXJuIG1fZWxlbWVudHM7IH0KICAgICBjb25zdCBWZWN0 b3I8Y2hhcj4mIGJvdW5kYXJ5KCkgY29uc3QgeyByZXR1cm4gbV9ib3VuZGFyeTsgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNl UmVxdWVzdEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9i bGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdEJsYWNrQmVycnkuY3BwCmluZGV4IGJkYTQwMjFkZmQx YTlkNWVjNTFhYTI2NTE5NTEyMjVlNzE5OWI3MDEuLmQxMmU0ODQ5ZTc1NDkzOGNiODNmZjQ3YzMw YWJlMzZmZTczOTFjNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3RCbGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0QmxhY2tC ZXJyeS5jcHAKQEAgLTE1Nyw3ICsxNTcsMTEgQEAgdm9pZCBSZXNvdXJjZVJlcXVlc3Q6OmluaXRp YWxpemVQbGF0Zm9ybVJlcXVlc3QoTmV0d29ya1JlcXVlc3QmIHBsYXRmb3JtUmVxdWVzdCwKICAg ICAgICAgcGxhdGZvcm1SZXF1ZXN0LnNldFN1Z2dlc3RlZFNhdmVOYW1lKHN1Z2dlc3RlZFNhdmVO YW1lKCkpOwogCiAgICAgICAgIGlmIChodHRwQm9keSgpICYmICFodHRwQm9keSgpLT5pc0VtcHR5 KCkpIHsKLSAgICAgICAgICAgIGNvbnN0IFZlY3RvcjxGb3JtRGF0YUVsZW1lbnQ+JiBlbGVtZW50 cyA9IGh0dHBCb2R5KCktPmVsZW1lbnRzKCk7CisgICAgICAgICAgICBSZWZQdHI8Rm9ybURhdGE+ IGZvcm1EYXRhID0gaHR0cEJvZHkoKTsKKyNpZiBFTkFCTEUoQkxPQikKKyAgICAgICAgICAgIGZv cm1EYXRhID0gZm9ybURhdGEtPnJlc29sdmVCbG9iUmVmZXJlbmNlcygpOworI2VuZGlmCisgICAg ICAgICAgICBjb25zdCBWZWN0b3I8Rm9ybURhdGFFbGVtZW50PiYgZWxlbWVudHMgPSBmb3JtRGF0 YS0+ZWxlbWVudHMoKTsKICAgICAgICAgICAgIC8vIFVzZSBzZXREYXRhIGZvciBzaW1wbGUgZm9y bXMgYmVjYXVzZSBpdCBpcyBzbGlnaHRseSBtb3JlIGVmZmljaWVudC4KICAgICAgICAgICAgIGlm IChlbGVtZW50cy5zaXplKCkgPT0gMSAmJiBlbGVtZW50c1swXS5tX3R5cGUgPT0gRm9ybURhdGFF bGVtZW50OjpkYXRhKQogICAgICAgICAgICAgICAgIHBsYXRmb3JtUmVxdWVzdC5zZXREYXRhKGVs ZW1lbnRzWzBdLm1fZGF0YS5kYXRhKCksIGVsZW1lbnRzWzBdLm1fZGF0YS5zaXplKCkpOwpAQCAt MTY4LDI0ICsxNzIsOCBAQCB2b2lkIFJlc291cmNlUmVxdWVzdDo6aW5pdGlhbGl6ZVBsYXRmb3Jt UmVxdWVzdChOZXR3b3JrUmVxdWVzdCYgcGxhdGZvcm1SZXF1ZXN0LAogICAgICAgICAgICAgICAg ICAgICAgICAgcGxhdGZvcm1SZXF1ZXN0LmFkZE11bHRpcGFydERhdGEoZWxlbWVudC5tX2RhdGEu ZGF0YSgpLCBlbGVtZW50Lm1fZGF0YS5zaXplKCkpOwogICAgICAgICAgICAgICAgICAgICBlbHNl IGlmIChlbGVtZW50Lm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OmVuY29kZWRGaWxlKQogICAg ICAgICAgICAgICAgICAgICAgICAgcGxhdGZvcm1SZXF1ZXN0LmFkZE11bHRpcGFydEZpbGVuYW1l KGVsZW1lbnQubV9maWxlbmFtZS5jaGFyYWN0ZXJzKCksIGVsZW1lbnQubV9maWxlbmFtZS5sZW5n dGgoKSk7Ci0jaWYgRU5BQkxFKEJMT0IpCi0gICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKGVs ZW1lbnQubV90eXBlID09IEZvcm1EYXRhRWxlbWVudDo6ZW5jb2RlZEJsb2IpIHsKLSAgICAgICAg ICAgICAgICAgICAgICAgIFJlZlB0cjxCbG9iU3RvcmFnZURhdGE+IGJsb2JEYXRhID0gc3RhdGlj X2Nhc3Q8QmxvYlJlZ2lzdHJ5SW1wbCY+KGJsb2JSZWdpc3RyeSgpKS5nZXRCbG9iRGF0YUZyb21V UkwoS1VSTChQYXJzZWRVUkxTdHJpbmcsIGVsZW1lbnQubV91cmwpKTsKLSAgICAgICAgICAgICAg ICAgICAgICAgIGlmIChibG9iRGF0YSkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZv ciAoc2l6ZV90IGogPSAwOyBqIDwgYmxvYkRhdGEtPml0ZW1zKCkuc2l6ZSgpOyArK2opIHsKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgQmxvYkRhdGFJdGVtJiBibG9iSXRl bSA9IGJsb2JEYXRhLT5pdGVtcygpW2pdOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpZiAoYmxvYkl0ZW0udHlwZSA9PSBCbG9iRGF0YUl0ZW06OkRhdGEpCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBwbGF0Zm9ybVJlcXVlc3QuYWRkTXVsdGlwYXJ0RGF0YShi bG9iSXRlbS5kYXRhLT5kYXRhKCkgKyBzdGF0aWNfY2FzdDxpbnQ+KGJsb2JJdGVtLm9mZnNldCks IHN0YXRpY19jYXN0PGludD4oYmxvYkl0ZW0ubGVuZ3RoKSk7Ci0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg QVNTRVJUKGJsb2JJdGVtLnR5cGUgPT0gQmxvYkRhdGFJdGVtOjpGaWxlKTsKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHBsYXRmb3JtUmVxdWVzdC5hZGRNdWx0aXBhcnRGaWxl bmFtZShibG9iSXRlbS5wYXRoLmNoYXJhY3RlcnMoKSwgYmxvYkl0ZW0ucGF0aC5sZW5ndGgoKSwg YmxvYkl0ZW0ub2Zmc2V0LCBibG9iSXRlbS5sZW5ndGgsIGJsb2JJdGVtLmV4cGVjdGVkTW9kaWZp Y2F0aW9uVGltZSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICAgICAgICAgIH0KLSNlbmRpZgogICAgICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAg ICAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgLy8gdW5rbm93biB0eXBlCisg ICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgLy8gQmxvYnMgc2hv dWxkIGJlIHJlc29sdmVkIGF0IHRoaXMgcG9pbnQuCiAgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgfQogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2NmL0Zvcm1EYXRhU3RyZWFtQ0ZOZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jZi9Gb3JtRGF0YVN0cmVhbUNGTmV0LmNwcAppbmRleCAyMzNjOGM3YmVhZGU5 ODVkZmVmYTFkMmVlODAwZDllYmRkMjRiOTcwLi5iMjAyMTM5NDQ5NzAyMGY1NDdkNjI2YjM4ZjI4 NmU4MDM0MzY2ZTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2NmL0Zvcm1EYXRhU3RyZWFtQ0ZOZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY2YvRm9ybURhdGFTdHJlYW1DRk5ldC5jcHAKQEAgLTM5NSw0NiArMzk1LDggQEAg dm9pZCBzZXRIVFRQQm9keShDRk11dGFibGVVUkxSZXF1ZXN0UmVmIHJlcXVlc3QsIFBhc3NSZWZQ dHI8Rm9ybURhdGE+IHBycEZvcm1EYXQKICAgICB9CiAKICNpZiBFTkFCTEUoQkxPQikKLSAgICAv LyBDaGVjayBpZiB0aGVyZSBpcyBhIGJsb2IgaW4gdGhlIGZvcm0gZGF0YS4KLSAgICBib29sIGhh c0Jsb2IgPSBmYWxzZTsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsK LSAgICAgICAgY29uc3QgRm9ybURhdGFFbGVtZW50JiBlbGVtZW50ID0gZm9ybURhdGEtPmVsZW1l bnRzKClbaV07Ci0gICAgICAgIGlmIChlbGVtZW50Lm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6 OmVuY29kZWRCbG9iKSB7Ci0gICAgICAgICAgICBoYXNCbG9iID0gdHJ1ZTsKLSAgICAgICAgICAg IGJyZWFrOwotICAgICAgICB9Ci0gICAgfQotCi0gICAgLy8gSWYgeWVzLCB3ZSBoYXZlIHRvIHJl c29sdmUgYWxsIHRoZSBibG9iIHJlZmVyZW5jZXMgYW5kIHJlZ2VuZXJhdGUgdGhlIGZvcm0gZGF0 YSB3aXRoIG9ubHkgZGF0YSBhbmQgZmlsZSB0eXBlcy4KLSAgICBpZiAoaGFzQmxvYikgewotICAg ICAgICBSZWZQdHI8Rm9ybURhdGE+IG5ld0Zvcm1EYXRhID0gRm9ybURhdGE6OmNyZWF0ZSgpOwot ICAgICAgICBuZXdGb3JtRGF0YS0+c2V0QWx3YXlzU3RyZWFtKGZvcm1EYXRhLT5hbHdheXNTdHJl YW0oKSk7Ci0gICAgICAgIG5ld0Zvcm1EYXRhLT5zZXRJZGVudGlmaWVyKGZvcm1EYXRhLT5pZGVu dGlmaWVyKCkpOwotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsK LSAgICAgICAgICAgIGNvbnN0IEZvcm1EYXRhRWxlbWVudCYgZWxlbWVudCA9IGZvcm1EYXRhLT5l bGVtZW50cygpW2ldOwotICAgICAgICAgICAgaWYgKGVsZW1lbnQubV90eXBlID09IEZvcm1EYXRh RWxlbWVudDo6ZGF0YSkKLSAgICAgICAgICAgICAgICBuZXdGb3JtRGF0YS0+YXBwZW5kRGF0YShl bGVtZW50Lm1fZGF0YS5kYXRhKCksIGVsZW1lbnQubV9kYXRhLnNpemUoKSk7Ci0gICAgICAgICAg ICBlbHNlIGlmIChlbGVtZW50Lm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OmVuY29kZWRGaWxl KQotICAgICAgICAgICAgICAgIG5ld0Zvcm1EYXRhLT5hcHBlbmRGaWxlKGVsZW1lbnQubV9maWxl bmFtZSwgZWxlbWVudC5tX3Nob3VsZEdlbmVyYXRlRmlsZSk7Ci0gICAgICAgICAgICBlbHNlIHsK LSAgICAgICAgICAgICAgICBBU1NFUlQoZWxlbWVudC5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50 OjplbmNvZGVkQmxvYik7Ci0gICAgICAgICAgICAgICAgUmVmUHRyPEJsb2JTdG9yYWdlRGF0YT4g YmxvYkRhdGEgPSBzdGF0aWNfY2FzdDxCbG9iUmVnaXN0cnlJbXBsJj4oYmxvYlJlZ2lzdHJ5KCkp LmdldEJsb2JEYXRhRnJvbVVSTChLVVJMKFBhcnNlZFVSTFN0cmluZywgZWxlbWVudC5tX3VybCkp OwotICAgICAgICAgICAgICAgIGlmIChibG9iRGF0YSkgewotICAgICAgICAgICAgICAgICAgICBm b3IgKHNpemVfdCBqID0gMDsgaiA8IGJsb2JEYXRhLT5pdGVtcygpLnNpemUoKTsgKytqKSB7Ci0g ICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBCbG9iRGF0YUl0ZW0mIGJsb2JJdGVtID0gYmxv YkRhdGEtPml0ZW1zKClbal07Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoYmxvYkl0ZW0u dHlwZSA9PSBCbG9iRGF0YUl0ZW06OkRhdGEpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg bmV3Rm9ybURhdGEtPmFwcGVuZERhdGEoYmxvYkl0ZW0uZGF0YS0+ZGF0YSgpICsgc3RhdGljX2Nh c3Q8aW50PihibG9iSXRlbS5vZmZzZXQpLCBzdGF0aWNfY2FzdDxpbnQ+KGJsb2JJdGVtLmxlbmd0 aCkpOwotICAgICAgICAgICAgICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgQVNTRVJUKGJsb2JJdGVtLnR5cGUgPT0gQmxvYkRhdGFJdGVtOjpGaWxlKTsKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICBuZXdGb3JtRGF0YS0+YXBwZW5kRmlsZVJhbmdlKGJs b2JJdGVtLnBhdGgsIGJsb2JJdGVtLm9mZnNldCwgYmxvYkl0ZW0ubGVuZ3RoLCBibG9iSXRlbS5l eHBlY3RlZE1vZGlmaWNhdGlvblRpbWUpOwotICAgICAgICAgICAgICAgICAgICAgICAgfQotICAg ICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQotICAg ICAgICB9Ci0gICAgICAgIGZvcm1EYXRhID0gbmV3Rm9ybURhdGEucmVsZWFzZSgpOwotICAgICAg ICBjb3VudCA9IGZvcm1EYXRhLT5lbGVtZW50cygpLnNpemUoKTsKLSAgICB9CisgICAgZm9ybURh dGEgPSBmb3JtRGF0YS0+cmVzb2x2ZUJsb2JSZWZlcmVuY2VzKCk7CisgICAgY291bnQgPSBmb3Jt RGF0YS0+ZWxlbWVudHMoKS5zaXplKCk7CiAjZW5kaWYKIAogICAgIC8vIFByZWNvbXB1dGUgdGhl IGNvbnRlbnQgbGVuZ3RoIHNvIE5TVVJMQ29ubmVjdGlvbiBkb2Vzbid0IHVzZSBjaHVua2VkIG1v ZGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3 b3JrUmVwbHlIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQv UU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwCmluZGV4IDhhYmNmOGMwNzY2ZjQ3OGUxOGZhNjczOTcx MWE3ZGM0ZmQ0ZTY1YjIuLjVkZjQ3M2VjZTM2OWRmMjkyMzAwYzNmOTA2ZDBiMjdjNzAxZTlmNzMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtS ZXBseUhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQv UU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwCkBAIC0yMSw3ICsyMSw3IEBACiAjaW5jbHVkZSAiY29u ZmlnLmgiCiAjaW5jbHVkZSAiUU5ldHdvcmtSZXBseUhhbmRsZXIuaCIKIAotI2luY2x1ZGUgIkJs b2JSZWdpc3RyeUltcGwuaCIKKyNpbmNsdWRlICJCbG9iRGF0YS5oIgogI2luY2x1ZGUgIkhUVFBQ YXJzZXJzLmgiCiAjaW5jbHVkZSAiTUlNRVR5cGVSZWdpc3RyeS5oIgogI2luY2x1ZGUgIlJlc291 cmNlSGFuZGxlLmgiCkBAIC02MSw2OCArNjEsMTkgQEAgRm9ybURhdGFJT0RldmljZTo6fkZvcm1E YXRhSU9EZXZpY2UoKQogICAgIGRlbGV0ZSBtX2N1cnJlbnRGaWxlOwogfQogCi0jaWYgRU5BQkxF KEJMT0IpCi1zdGF0aWMgdm9pZCBhcHBlbmRCbG9iUmVzb2x2ZWQoRm9ybURhdGEqIGZvcm1EYXRh LCBjb25zdCBLVVJMJiB1cmwpCi17Ci0gICAgUmVmUHRyPEJsb2JTdG9yYWdlRGF0YT4gYmxvYkRh dGEgPSBzdGF0aWNfY2FzdDxCbG9iUmVnaXN0cnlJbXBsJj4oYmxvYlJlZ2lzdHJ5KCkpLmdldEJs b2JEYXRhRnJvbVVSTChLVVJMKFBhcnNlZFVSTFN0cmluZywgdXJsKSk7Ci0gICAgaWYgKGJsb2JE YXRhKSB7Ci0gICAgICAgIEJsb2JEYXRhSXRlbUxpc3Q6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gYmxv YkRhdGEtPml0ZW1zKCkuYmVnaW4oKTsKLSAgICAgICAgY29uc3QgQmxvYkRhdGFJdGVtTGlzdDo6 Y29uc3RfaXRlcmF0b3IgaXRlbmQgPSBibG9iRGF0YS0+aXRlbXMoKS5lbmQoKTsKLSAgICAgICAg Zm9yICg7IGl0ICE9IGl0ZW5kOyArK2l0KSB7Ci0gICAgICAgICAgICBjb25zdCBCbG9iRGF0YUl0 ZW0mIGJsb2JJdGVtID0gKml0OwotICAgICAgICAgICAgaWYgKGJsb2JJdGVtLnR5cGUgPT0gQmxv YkRhdGFJdGVtOjpEYXRhKQotICAgICAgICAgICAgICAgIGZvcm1EYXRhLT5hcHBlbmREYXRhKGJs b2JJdGVtLmRhdGEtPmRhdGEoKSArIHN0YXRpY19jYXN0PGludD4oYmxvYkl0ZW0ub2Zmc2V0KSwg c3RhdGljX2Nhc3Q8aW50PihibG9iSXRlbS5sZW5ndGgpKTsKLSAgICAgICAgICAgIGVsc2UgaWYg KGJsb2JJdGVtLnR5cGUgPT0gQmxvYkRhdGFJdGVtOjpGaWxlKQotICAgICAgICAgICAgICAgIGZv cm1EYXRhLT5hcHBlbmRGaWxlUmFuZ2UoYmxvYkl0ZW0ucGF0aCwgYmxvYkl0ZW0ub2Zmc2V0LCBi bG9iSXRlbS5sZW5ndGgsIGJsb2JJdGVtLmV4cGVjdGVkTW9kaWZpY2F0aW9uVGltZSk7Ci0gICAg ICAgICAgICBlbHNlIGlmIChibG9iSXRlbS50eXBlID09IEJsb2JEYXRhSXRlbTo6QmxvYikKLSAg ICAgICAgICAgICAgICBhcHBlbmRCbG9iUmVzb2x2ZWQoZm9ybURhdGEsIGJsb2JJdGVtLnVybCk7 Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 Ci0gICAgICAgIH0KLSAgICB9Ci19Ci0jZW5kaWYKLQogdm9pZCBGb3JtRGF0YUlPRGV2aWNlOjpw cmVwYXJlRm9ybUVsZW1lbnRzKEZvcm1EYXRhKiBmb3JtRGF0YSkKIHsKICAgICBpZiAoIWZvcm1E YXRhKQogICAgICAgICByZXR1cm47CiAKLSNpZiBFTkFCTEUoQkxPQikKLSAgICBib29sIGhhc0Js b2IgPSBmYWxzZTsKLSAgICBWZWN0b3I8Rm9ybURhdGFFbGVtZW50Pjo6Y29uc3RfaXRlcmF0b3Ig aXQgPSBmb3JtRGF0YS0+ZWxlbWVudHMoKS5iZWdpbigpOwotICAgIGNvbnN0IFZlY3RvcjxGb3Jt RGF0YUVsZW1lbnQ+Ojpjb25zdF9pdGVyYXRvciBpdGVuZCA9IGZvcm1EYXRhLT5lbGVtZW50cygp LmVuZCgpOwotICAgIGZvciAoOyBpdCAhPSBpdGVuZDsgKytpdCkgewotICAgICAgICBpZiAoaXQt Pm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OmVuY29kZWRCbG9iKSB7Ci0gICAgICAgICAgICBo YXNCbG9iID0gdHJ1ZTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgfQorICAg IFJlZlB0cjxGb3JtRGF0YT4gZm9ybURhdGFSZWYoZm9ybURhdGEpOwogCi0gICAgLy8gUmVzb2x2 ZSBhbGwgYmxvYnMgc28gd2Ugb25seSBoYXZlIGZpbGUgYW5kIGRhdGEuCi0gICAgaWYgKGhhc0Js b2IpIHsKLSAgICAgICAgUmVmUHRyPEZvcm1EYXRhPiBuZXdGb3JtRGF0YSA9IEZvcm1EYXRhOjpj cmVhdGUoKTsKLSAgICAgICAgbmV3Rm9ybURhdGEtPnNldEFsd2F5c1N0cmVhbShmb3JtRGF0YS0+ YWx3YXlzU3RyZWFtKCkpOwotICAgICAgICBuZXdGb3JtRGF0YS0+c2V0SWRlbnRpZmllcihmb3Jt RGF0YS0+aWRlbnRpZmllcigpKTsKLSAgICAgICAgaXQgPSBmb3JtRGF0YS0+ZWxlbWVudHMoKS5i ZWdpbigpOwotICAgICAgICBmb3IgKDsgaXQgIT0gaXRlbmQ7ICsraXQpIHsKLSAgICAgICAgICAg IGNvbnN0IEZvcm1EYXRhRWxlbWVudCYgZWxlbWVudCA9ICppdDsKLSAgICAgICAgICAgIGlmIChl bGVtZW50Lm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OmRhdGEpCi0gICAgICAgICAgICAgICAg bmV3Rm9ybURhdGEtPmFwcGVuZERhdGEoZWxlbWVudC5tX2RhdGEuZGF0YSgpLCBlbGVtZW50Lm1f ZGF0YS5zaXplKCkpOwotICAgICAgICAgICAgZWxzZSBpZiAoZWxlbWVudC5tX3R5cGUgPT0gRm9y bURhdGFFbGVtZW50OjplbmNvZGVkRmlsZSkKLSAgICAgICAgICAgICAgICBuZXdGb3JtRGF0YS0+ YXBwZW5kRmlsZVJhbmdlKGVsZW1lbnQubV9maWxlbmFtZSwgZWxlbWVudC5tX2ZpbGVTdGFydCwg ZWxlbWVudC5tX2ZpbGVMZW5ndGgsIGVsZW1lbnQubV9leHBlY3RlZEZpbGVNb2RpZmljYXRpb25U aW1lLCBlbGVtZW50Lm1fc2hvdWxkR2VuZXJhdGVGaWxlKTsKLSAgICAgICAgICAgIGVsc2UgaWYg KGVsZW1lbnQubV90eXBlID09IEZvcm1EYXRhRWxlbWVudDo6ZW5jb2RlZEJsb2IpCi0gICAgICAg ICAgICAgICAgYXBwZW5kQmxvYlJlc29sdmVkKG5ld0Zvcm1EYXRhLmdldCgpLCBlbGVtZW50Lm1f dXJsKTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKLSAgICAgICAgfQotICAgICAgICBtX2Zvcm1FbGVtZW50cyA9IG5ld0Zvcm1EYXRhLT5l bGVtZW50cygpOwotICAgICAgICByZXR1cm47Ci0gICAgfQorI2lmIEVOQUJMRShCTE9CKQorICAg IGZvcm1EYXRhUmVmID0gZm9ybURhdGFSZWYtPnJlc29sdmVCbG9iUmVmZXJlbmNlcygpOwogI2Vu ZGlmCiAKICAgICAvLyBUYWtlIGEgZGVlcCBjb3B5IG9mIHRoZSBGb3JtRGF0YUVsZW1lbnRzCi0g ICAgbV9mb3JtRWxlbWVudHMgPSBmb3JtRGF0YS0+ZWxlbWVudHMoKTsKKyAgICBtX2Zvcm1FbGVt ZW50cyA9IGZvcm1EYXRhUmVmLT5lbGVtZW50cygpOwogfQogCiAK