64932 2011-07-21 03:43:45 -0700 [EFL] Add NULL checks to ewk_window_features_new_from_core and ewk_view_window_create. 2011-09-14 06:51:41 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Linux RESOLVED FIXED P2 Normal --- 0 g.czajkowski webkit-unassigned gyuyoung.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 440337 0 g.czajkowski 2011-07-21 03:43:45 -0700 It prevents the crash while allocating a memory for the new window. 440338 1 101569 g.czajkowski 2011-07-21 03:45:13 -0700 Created attachment 101569 proposed patch 440364 2 rakuco 2011-07-21 06:13:09 -0700 Did this actually happen to you when you were doing some tests, or is this a hypothetical case? > Source/WebKit/efl/ChangeLog:3 > + [EFL] Added NULL cheking in ewk_window_features_new_from_core and ewk_view_window_create. checking -> checking In general, these descriptions are in the present tense, so it might be better phrased as "Add NULL checks to ewk_window_features_new_from_core and ewk_view_window_create". > Source/WebKit/efl/ChangeLog:6 > + It prevents the crash while allocating a memory for the new window. the -> a a memory -> memory 440370 3 g.czajkowski 2011-07-21 06:25:42 -0700 (In reply to comment #2) > Did this actually happen to you when you were doing some tests, or is this a hypothetical case? > This is a hypothetical case:) Generally we check malloc (and friend) returned value in WebKit-EFL. Just this is one them :) 440385 4 101584 g.czajkowski 2011-07-21 07:07:01 -0700 Created attachment 101584 updated patch Fixed patch according to Raphael's suggestions. 440410 5 rakuco 2011-07-21 08:00:11 -0700 r+ from my side. 440411 6 g.czajkowski 2011-07-21 08:01:44 -0700 (In reply to comment #3) > (In reply to comment #2) > > Did this actually happen to you when you were doing some tests, or is this a hypothetical case? > > > This is a hypothetical case:) Generally we check malloc (and friend) returned value in WebKit-EFL. Just this is one them :) One more thing. This is one of important defects in WebKit-EFL which was found by static analysis tools. These tools sometimes provide not reliable data. We should appraise whether this defect is really bug for us or not :) I think we should fix it in this case. 447916 7 101584 gyuyoung.kim 2011-08-08 01:47:40 -0700 Comment on attachment 101584 updated patch LGTM. I think this patch needs to be landed. 465872 8 101584 eric 2011-09-12 15:48:10 -0700 Comment on attachment 101584 updated patch rs=me. 466064 9 101584 webkit.review.bot 2011-09-12 20:13:59 -0700 Comment on attachment 101584 updated patch Rejecting attachment 101584 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: ebKit/efl/ewk/ewk_view.cpp Hunk #1 succeeded at 2864 (offset -809 lines). Hunk #2 FAILED at 3685. 1 out of 2 hunks FAILED -- saving rejects to file Source/WebKit/efl/ewk/ewk_view.cpp.rej patching file Source/WebKit/efl/ewk/ewk_window_features.cpp Hunk #1 FAILED at 150. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebKit/efl/ewk/ewk_window_features.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Eric Seidel', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/9648315 466983 10 107321 g.czajkowski 2011-09-14 05:44:52 -0700 Created attachment 107321 proposed patch Patch has been re-based. 466984 11 107321 gyuyoung.kim 2011-09-14 05:50:40 -0700 Comment on attachment 107321 proposed patch LGTM. 466997 12 107321 webkit.review.bot 2011-09-14 06:51:35 -0700 Comment on attachment 107321 proposed patch Clearing flags on attachment: 107321 Committed r95088: <http://trac.webkit.org/changeset/95088> 466998 13 webkit.review.bot 2011-09-14 06:51:41 -0700 All reviewed patches have been landed. Closing bug. 101569 2011-07-21 03:45:13 -0700 2011-07-21 07:07:01 -0700 proposed patch null_check.patch text/plain 2886 g.czajkowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCBmZjFiNjJiLi42ZGM5ZDQ3IDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMjAgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWpr b3dza2lAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gQWRkZWQgTlVMTCBjaGVraW5nIGlu IGV3a193aW5kb3dfZmVhdHVyZXNfbmV3X2Zyb21fY29yZSBhbmQgZXdrX3ZpZXdfd2luZG93X2Ny ZWF0ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0 OTMyCisKKyAgICAgICAgSXQgcHJldmVudHMgdGhlIGNyYXNoIHdoaWxlIGFsbG9jYXRpbmcgYSBt ZW1vcnkgZm9yIHRoZSBuZXcgd2luZG93LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a192aWV3 X3dpbmRvd19jcmVhdGUpOgorICAgICAgICAqIGV3ay9ld2tfd2luZG93X2ZlYXR1cmVzLmNwcDoK KyAgICAgICAgKGV3a193aW5kb3dfZmVhdHVyZXNfbmV3X2Zyb21fY29yZSk6CisKIDIwMTEtMDct MTkgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBb RUZMXSBBZGQgZXdrX25ldHdvcmsuY3BwfGggZmlsZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 LmNwcAppbmRleCAzOGU2YzYxLi4yOWM3MzZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Vm bC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5j cHAKQEAgLTM2NzMsNyArMzY3Myw3IEBAIHZvaWQgZXdrX3ZpZXdfcmVzdG9yZV9zdGF0ZShFdmFz X09iamVjdCogbywgRXZhc19PYmplY3QqIGZyYW1lKQogICogTlVMTCwgaXQgd2lsbCBiZSBjcmVh dGVkIGEgd2luZG93IHdpdGggZGVmYXVsdCBmZWF0dXJlcy4KICAqCiAgKiBAcmV0dXJuIE5ldyB2 aWV3LCBpbiBjYXNlIHNtYXJ0IGNsYXNzIGltcGxlbWVudHMgdGhlIGNyZWF0aW9uIG9mIG5ldyB3 aW5kb3dzOwotICogZWxzZSwgY3VycmVudCB2aWV3IEBwYXJhbSBvLgorICogZWxzZSwgY3VycmVu dCB2aWV3IEBwYXJhbSBvIG9yIEBjIDAgb24gZmFpbHVyZS4KICAqCiAgKiBAc2VlIGV3a193aW5k b3dfZmVhdHVyZXNfcmVmKCkuCiAgKi8KQEAgLTM2ODUsNiArMzY4NSw5IEBAIEV2YXNfT2JqZWN0 KiBld2tfdmlld193aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0KiBvLCBFaW5hX0Jvb2wgamF2YXNj cmlwdCwgY29uc3QKICAgICAgICAgcmV0dXJuIG87CiAKICAgICBFd2tfV2luZG93X0ZlYXR1cmVz KiB3aW5kb3dfZmVhdHVyZXMgPSBld2tfd2luZG93X2ZlYXR1cmVzX25ld19mcm9tX2NvcmUoY29y ZUZlYXR1cmVzKTsKKyAgICBpZiAoIXdpbmRvd19mZWF0dXJlcykKKyAgICAgICAgcmV0dXJuIDA7 CisKICAgICBFdmFzX09iamVjdCogdmlldyA9IHNkLT5hcGktPndpbmRvd19jcmVhdGUoc2QsIGph dmFzY3JpcHQsIHdpbmRvd19mZWF0dXJlcyk7CiAgICAgZXdrX3dpbmRvd19mZWF0dXJlc191bnJl Zih3aW5kb3dfZmVhdHVyZXMpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2sv ZXdrX3dpbmRvd19mZWF0dXJlcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3dpbmRv d19mZWF0dXJlcy5jcHAKaW5kZXggYWJjZTRiNi4uZTU1MzVlNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9lZmwvZXdrL2V3a193aW5kb3dfZmVhdHVyZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfd2luZG93X2ZlYXR1cmVzLmNwcApAQCAtMTUwLDExICsxNTAsMTUgQEAg dm9pZCBld2tfd2luZG93X2ZlYXR1cmVzX2ludF9wcm9wZXJ0eV9nZXQoRXdrX1dpbmRvd19GZWF0 dXJlcyogd2luZG93X2ZlYXR1cmVzLAogICoKICAqIEBwYXJhbSBjb3JlIGlmIG5vdCBAYyAwIGEg bmV3IFdlYkNvcmU6OldpbmRvd0ZlYXR1cmVzIGlzIGFsbG9jYXRlZCBjb3B5aW5nIGNvcmUgZmVh dHVyZXMgYW5kCiAgKiBpdCBpcyBlbWJlZGRlZCBpbnNpZGUgdGhlIEV3a19XaW5kb3dfRmVhdHVy ZXMgd2hvc2UgcmVmIGNvdW50IGlzIGluaXRpYWxpemVkLCBpZiBjb3JlIGlzIEBjIDAgYSBuZXcg b25lIGlzIGNyZWF0ZWQgd2l0aCB0aGUgZGVmYXVsdCBmZWF0dXJlcy4KLSAqIEByZXR1cm5zIGEg bmV3IGFsbG9jYXRlZCB0aGUgRXdrX1dpbmRvd19GZWF0dXJlcyBvYmplY3QKKyAqIEByZXR1cm4g YSBuZXcgYWxsb2NhdGVkIHRoZSBFd2tfV2luZG93X0ZlYXR1cmVzIG9iamVjdCBvbiBzdWNlc3Mg b3IgQGMgMCBvbiBmYWlsdXJlCiAgKi8KIEV3a19XaW5kb3dfRmVhdHVyZXMqIGV3a193aW5kb3df ZmVhdHVyZXNfbmV3X2Zyb21fY29yZShjb25zdCBXZWJDb3JlOjpXaW5kb3dGZWF0dXJlcyogY29y ZSkKIHsKICAgICBFd2tfV2luZG93X0ZlYXR1cmVzKiB3aW5kb3dfZmVhdHVyZXMgPSBzdGF0aWNf Y2FzdDxFd2tfV2luZG93X0ZlYXR1cmVzKj4obWFsbG9jKHNpemVvZigqd2luZG93X2ZlYXR1cmVz KSkpOworICAgIGlmICghd2luZG93X2ZlYXR1cmVzKSB7CisgICAgICAgIENSSVRJQ0FMKCJjb3Vs ZCBub3QgYWxsb2NhdGUgRXdrX1dpbmRvd19GZWF0dXJlcyIpOworICAgICAgICByZXR1cm4gMDsK KyAgICB9CiAKICAgICBpZiAoY29yZSkKICAgICAgICAgd2luZG93X2ZlYXR1cmVzLT5jb3JlID0g bmV3IFdlYkNvcmU6OldpbmRvd0ZlYXR1cmVzKCpjb3JlKTsK 101584 2011-07-21 07:07:01 -0700 2011-09-14 05:44:52 -0700 updated patch null_check.patch text/plain 2881 g.czajkowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCBmZjFiNjJiLi42ZGM5ZDQ3IDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMjAgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWpr b3dza2lAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gQWRkIE5VTEwgY2hlY2tzIHRvIGV3 a193aW5kb3dfZmVhdHVyZXNfbmV3X2Zyb21fY29yZSBhbmQgZXdrX3ZpZXdfd2luZG93X2NyZWF0 ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0OTMy CisKKyAgICAgICAgSXQgcHJldmVudHMgdGhlIGNyYXNoIHdoaWxlIGFsbG9jYXRpbmcgbWVtb3J5 IGZvciB0aGUgbmV3IHdpbmRvdy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tfdmlld193aW5k b3dfY3JlYXRlKToKKyAgICAgICAgKiBld2svZXdrX3dpbmRvd19mZWF0dXJlcy5jcHA6CisgICAg ICAgIChld2tfd2luZG93X2ZlYXR1cmVzX25ld19mcm9tX2NvcmUpOgorCiAyMDExLTA3LTE5ICBH eXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0g QWRkIGV3a19uZXR3b3JrLmNwcHxoIGZpbGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9l ZmwvZXdrL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAK aW5kZXggMzhlNmM2MS4uMjljNzM2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdr L2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCkBA IC0zNjczLDcgKzM2NzMsNyBAQCB2b2lkIGV3a192aWV3X3Jlc3RvcmVfc3RhdGUoRXZhc19PYmpl Y3QqIG8sIEV2YXNfT2JqZWN0KiBmcmFtZSkKICAqIE5VTEwsIGl0IHdpbGwgYmUgY3JlYXRlZCBh IHdpbmRvdyB3aXRoIGRlZmF1bHQgZmVhdHVyZXMuCiAgKgogICogQHJldHVybiBOZXcgdmlldywg aW4gY2FzZSBzbWFydCBjbGFzcyBpbXBsZW1lbnRzIHRoZSBjcmVhdGlvbiBvZiBuZXcgd2luZG93 czsKLSAqIGVsc2UsIGN1cnJlbnQgdmlldyBAcGFyYW0gby4KKyAqIGVsc2UsIGN1cnJlbnQgdmll dyBAcGFyYW0gbyBvciBAYyAwIG9uIGZhaWx1cmUuCiAgKgogICogQHNlZSBld2tfd2luZG93X2Zl YXR1cmVzX3JlZigpLgogICovCkBAIC0zNjg1LDYgKzM2ODUsOSBAQCBFdmFzX09iamVjdCogZXdr X3ZpZXdfd2luZG93X2NyZWF0ZShFdmFzX09iamVjdCogbywgRWluYV9Cb29sIGphdmFzY3JpcHQs IGNvbnN0CiAgICAgICAgIHJldHVybiBvOwogCiAgICAgRXdrX1dpbmRvd19GZWF0dXJlcyogd2lu ZG93X2ZlYXR1cmVzID0gZXdrX3dpbmRvd19mZWF0dXJlc19uZXdfZnJvbV9jb3JlKGNvcmVGZWF0 dXJlcyk7CisgICAgaWYgKCF3aW5kb3dfZmVhdHVyZXMpCisgICAgICAgIHJldHVybiAwOworCiAg ICAgRXZhc19PYmplY3QqIHZpZXcgPSBzZC0+YXBpLT53aW5kb3dfY3JlYXRlKHNkLCBqYXZhc2Ny aXB0LCB3aW5kb3dfZmVhdHVyZXMpOwogICAgIGV3a193aW5kb3dfZmVhdHVyZXNfdW5yZWYod2lu ZG93X2ZlYXR1cmVzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a193 aW5kb3dfZmVhdHVyZXMuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a193aW5kb3dfZmVh dHVyZXMuY3BwCmluZGV4IGFiY2U0YjYuLmU1NTM1ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfd2luZG93X2ZlYXR1cmVzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Vm bC9ld2svZXdrX3dpbmRvd19mZWF0dXJlcy5jcHAKQEAgLTE1MCwxMSArMTUwLDE1IEBAIHZvaWQg ZXdrX3dpbmRvd19mZWF0dXJlc19pbnRfcHJvcGVydHlfZ2V0KEV3a19XaW5kb3dfRmVhdHVyZXMq IHdpbmRvd19mZWF0dXJlcywKICAqCiAgKiBAcGFyYW0gY29yZSBpZiBub3QgQGMgMCBhIG5ldyBX ZWJDb3JlOjpXaW5kb3dGZWF0dXJlcyBpcyBhbGxvY2F0ZWQgY29weWluZyBjb3JlIGZlYXR1cmVz IGFuZAogICogaXQgaXMgZW1iZWRkZWQgaW5zaWRlIHRoZSBFd2tfV2luZG93X0ZlYXR1cmVzIHdo b3NlIHJlZiBjb3VudCBpcyBpbml0aWFsaXplZCwgaWYgY29yZSBpcyBAYyAwIGEgbmV3IG9uZSBp cyBjcmVhdGVkIHdpdGggdGhlIGRlZmF1bHQgZmVhdHVyZXMuCi0gKiBAcmV0dXJucyBhIG5ldyBh bGxvY2F0ZWQgdGhlIEV3a19XaW5kb3dfRmVhdHVyZXMgb2JqZWN0CisgKiBAcmV0dXJuIGEgbmV3 IGFsbG9jYXRlZCB0aGUgRXdrX1dpbmRvd19GZWF0dXJlcyBvYmplY3Qgb24gc3VjZXNzIG9yIEBj IDAgb24gZmFpbHVyZQogICovCiBFd2tfV2luZG93X0ZlYXR1cmVzKiBld2tfd2luZG93X2ZlYXR1 cmVzX25ld19mcm9tX2NvcmUoY29uc3QgV2ViQ29yZTo6V2luZG93RmVhdHVyZXMqIGNvcmUpCiB7 CiAgICAgRXdrX1dpbmRvd19GZWF0dXJlcyogd2luZG93X2ZlYXR1cmVzID0gc3RhdGljX2Nhc3Q8 RXdrX1dpbmRvd19GZWF0dXJlcyo+KG1hbGxvYyhzaXplb2YoKndpbmRvd19mZWF0dXJlcykpKTsK KyAgICBpZiAoIXdpbmRvd19mZWF0dXJlcykgeworICAgICAgICBDUklUSUNBTCgiY291bGQgbm90 IGFsbG9jYXRlIEV3a19XaW5kb3dfRmVhdHVyZXMiKTsKKyAgICAgICAgcmV0dXJuIDA7CisgICAg fQogCiAgICAgaWYgKGNvcmUpCiAgICAgICAgIHdpbmRvd19mZWF0dXJlcy0+Y29yZSA9IG5ldyBX ZWJDb3JlOjpXaW5kb3dGZWF0dXJlcygqY29yZSk7Cg== 107321 2011-09-14 05:44:52 -0700 2011-09-14 06:51:35 -0700 proposed patch null_check.patch text/plain 2899 g.czajkowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCBkZWMzODQ5Li45ZTQwYmI4IDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTEtMDktMTQgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWpr b3dza2lAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gQWRkIE5VTEwgY2hlY2tzIHRvIGV3 a193aW5kb3dfZmVhdHVyZXNfbmV3X2Zyb21fY29yZSBhbmQgZXdrX3ZpZXdfd2luZG93X2NyZWF0 ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0OTMy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCisKKyAgICAgICAgSXQgcHJldmVu dHMgdGhlIGNyYXNoIHdoaWxlIGFsbG9jYXRpbmcgbWVtb3J5IGZvciB0aGUgbmV3IHdpbmRvdy4K KworICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tfdmlld193aW5kb3df Y3JlYXRlKToKKyAgICAgICAgKiBld2svZXdrX3dpbmRvd19mZWF0dXJlcy5jcHA6CisgICAgICAg IChld2tfd2luZG93X2ZlYXR1cmVzX25ld19mcm9tX2NvcmUpOgorCiAyMDExLTA5LTEzICBSYXBo YWVsIEt1Ym8gZGEgQ29zdGEgIDxrdWJvQHByb2Z1c2lvbi5tb2JpPgogCiAgICAgICAgIFtFRkxd IERvIG5vdCBhbHdheXMgcmV0dXJuIHRoZSBjYWNoZWQgZnJhbWUgbmFtZS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9l d2svZXdrX3ZpZXcuY3BwCmluZGV4IDMyMjVjZDkuLmNlNTU1ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdr L2V3a192aWV3LmNwcApAQCAtMjg2NCw3ICsyODY0LDcgQEAgdm9pZCBld2tfdmlld19yZXN0b3Jl X3N0YXRlKEV2YXNfT2JqZWN0ICpvLCBFdmFzX09iamVjdCAqZnJhbWUpCiAgKiBOVUxMLCBpdCB3 aWxsIGJlIGNyZWF0ZWQgYSB3aW5kb3cgd2l0aCBkZWZhdWx0IGZlYXR1cmVzLgogICoKICAqIEBy ZXR1cm4gTmV3IHZpZXcsIGluIGNhc2Ugc21hcnQgY2xhc3MgaW1wbGVtZW50cyB0aGUgY3JlYXRp b24gb2YgbmV3IHdpbmRvd3M7Ci0gKiBlbHNlLCBjdXJyZW50IHZpZXcgQHBhcmFtIG8uCisgKiBl bHNlLCBjdXJyZW50IHZpZXcgQHBhcmFtIG8gb3IgQGMgMCBvbiBmYWlsdXJlLgogICoKICAqIEBz ZWUgZXdrX3dpbmRvd19mZWF0dXJlc19yZWYoKS4KICAqLwpAQCAtMjg3Niw2ICsyODc2LDkgQEAg RXZhc19PYmplY3QgKmV3a192aWV3X3dpbmRvd19jcmVhdGUoRXZhc19PYmplY3QgKm8sIEVpbmFf Qm9vbCBqYXZhc2NyaXB0LCBjb25zdAogICAgICAgICByZXR1cm4gbzsKIAogICAgIEV3a19XaW5k b3dfRmVhdHVyZXMgKndpbmRvd19mZWF0dXJlcyA9IGV3a193aW5kb3dfZmVhdHVyZXNfbmV3X2Zy b21fY29yZShjb3JlRmVhdHVyZXMpOworICAgIGlmICghd2luZG93X2ZlYXR1cmVzKQorICAgICAg ICByZXR1cm4gMDsKKwogICAgIEV2YXNfT2JqZWN0KiB2aWV3ID0gc2QtPmFwaS0+d2luZG93X2Ny ZWF0ZShzZCwgamF2YXNjcmlwdCwgd2luZG93X2ZlYXR1cmVzKTsKICAgICBld2tfd2luZG93X2Zl YXR1cmVzX3VucmVmKHdpbmRvd19mZWF0dXJlcyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfd2luZG93X2ZlYXR1cmVzLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3 ay9ld2tfd2luZG93X2ZlYXR1cmVzLmNwcAppbmRleCA2OWQ1MmY5Li40YmI2ZTA2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3dpbmRvd19mZWF0dXJlcy5jcHAKKysrIGIv U291cmNlL1dlYktpdC9lZmwvZXdrL2V3a193aW5kb3dfZmVhdHVyZXMuY3BwCkBAIC0xMDUsMTEg KzEwNSwxNSBAQCB2b2lkIGV3a193aW5kb3dfZmVhdHVyZXNfaW50X3Byb3BlcnR5X2dldChjb25z dCBFd2tfV2luZG93X0ZlYXR1cmVzICp3aW5kb3dfZmVhdAogICoKICAqIEBwYXJhbSBjb3JlIGlm IG5vdCBAYyAwIGEgbmV3IFdlYkNvcmU6OldpbmRvd0ZlYXR1cmVzIGlzIGFsbG9jYXRlZCBjb3B5 aW5nIGNvcmUgZmVhdHVyZXMgYW5kCiAgKiBpdCBpcyBlbWJlZGRlZCBpbnNpZGUgdGhlIEV3a19X aW5kb3dfRmVhdHVyZXMgd2hvc2UgcmVmIGNvdW50IGlzIGluaXRpYWxpemVkLCBpZiBjb3JlIGlz IEBjIDAgYSBuZXcgb25lIGlzIGNyZWF0ZWQgd2l0aCB0aGUgZGVmYXVsdCBmZWF0dXJlcy4KLSAq IEByZXR1cm5zIGEgbmV3IGFsbG9jYXRlZCB0aGUgRXdrX1dpbmRvd19GZWF0dXJlcyBvYmplY3QK KyAqIEByZXR1cm4gYSBuZXcgYWxsb2NhdGVkIHRoZSBFd2tfV2luZG93X0ZlYXR1cmVzIG9iamVj dCBvbiBzdWNlc3Mgb3IgQGMgMCBvbiBmYWlsdXJlCiAgKi8KIEV3a19XaW5kb3dfRmVhdHVyZXMg KmV3a193aW5kb3dfZmVhdHVyZXNfbmV3X2Zyb21fY29yZShjb25zdCBXZWJDb3JlOjpXaW5kb3dG ZWF0dXJlcyAqY29yZSkKIHsKICAgICBFd2tfV2luZG93X0ZlYXR1cmVzICp3aW5kb3dfZmVhdHVy ZXMgPSBzdGF0aWNfY2FzdDxFd2tfV2luZG93X0ZlYXR1cmVzKj4obWFsbG9jKHNpemVvZigqd2lu ZG93X2ZlYXR1cmVzKSkpOworICAgIGlmICghd2luZG93X2ZlYXR1cmVzKSB7CisgICAgICAgIENS SVRJQ0FMKCJDb3VsZCBub3QgYWxsb2NhdGUgRXdrX1dpbmRvd19GZWF0dXJlcy4iKTsKKyAgICAg ICAgcmV0dXJuIDA7CisgICAgfQogCiAgICAgaWYgKGNvcmUpCiAgICAgICAgIHdpbmRvd19mZWF0 dXJlcy0+Y29yZSA9IG5ldyBXZWJDb3JlOjpXaW5kb3dGZWF0dXJlcygqY29yZSk7Cg==