david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Block patches for the 2.6 release

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQEcBAABCAAGBQJXA9iEAAoJEDuxQgLoOKytf3IH/38iDKWTrKi4S23AuNZD+0+z
 1Eko0zYcmw85FSIe96vUcOfeWHJ1VXdb+RyEtFpYxeedr13ypU+mUrd3OYHSmp1Q
 tEj/deLkwJ0ZDL45BTUOaycCc3N2N0U9hKKo3SV1PdG7ehc2iwetTQ5aNJVDltmf
 xe4GRaO7i/r9ONSHQuVjOxKOzGfHxekJsG2rJ52fdkrBMHsE4MqTUkyT0ieF1QOn
 OtR09hTvzpA3wCN/wJfceWcUUueAtC42jfZ6w2W82uJK3Kv2EIpHwAMMObqT5QkH
 oZxvsukR+VXztFyPU5sCuCOgb50Da66xJnMFaCipFQFRZKzP59fMdvW/6heT/qQ=
 =LC0z
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-04-05' into queue-block

Block patches for the 2.6 release

# gpg: Signature made Tue Apr  5 17:23:48 2016 CEST using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"

* mreitz/tags/pull-block-for-kevin-2016-04-05:
  crypto: Avoid memory leak on failure
  qemu-iotests: 149: Use "/usr/bin/env python"

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2016-04-05 17:31:20 +02:00
commit 6a5c357fdb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/crypto.c
View File

@ -196,6 +196,7 @@ block_crypto_open_opts_init(QCryptoBlockFormat format,
OptsVisitor *ov; OptsVisitor *ov;
QCryptoBlockOpenOptions *ret = NULL; QCryptoBlockOpenOptions *ret = NULL;
Error *local_err = NULL; Error *local_err = NULL;
Error *end_err = NULL;
ret = g_new0(QCryptoBlockOpenOptions, 1); ret = g_new0(QCryptoBlockOpenOptions, 1);
ret->format = format; ret->format = format;
@ -218,10 +219,9 @@ block_crypto_open_opts_init(QCryptoBlockFormat format,
error_setg(&local_err, "Unsupported block format %d", format); error_setg(&local_err, "Unsupported block format %d", format);
break; break;
} }
error_propagate(errp, local_err);
local_err = NULL;
visit_end_struct(opts_get_visitor(ov), &local_err); visit_end_struct(opts_get_visitor(ov), &end_err);
error_propagate(&local_err, end_err);
out: out:
if (local_err) { if (local_err) {
@ -242,6 +242,7 @@ block_crypto_create_opts_init(QCryptoBlockFormat format,
OptsVisitor *ov; OptsVisitor *ov;
QCryptoBlockCreateOptions *ret = NULL; QCryptoBlockCreateOptions *ret = NULL;
Error *local_err = NULL; Error *local_err = NULL;
Error *end_err = NULL;
ret = g_new0(QCryptoBlockCreateOptions, 1); ret = g_new0(QCryptoBlockCreateOptions, 1);
ret->format = format; ret->format = format;
@ -264,10 +265,9 @@ block_crypto_create_opts_init(QCryptoBlockFormat format,
error_setg(&local_err, "Unsupported block format %d", format); error_setg(&local_err, "Unsupported block format %d", format);
break; break;
} }
error_propagate(errp, local_err);
local_err = NULL;
visit_end_struct(opts_get_visitor(ov), &local_err); visit_end_struct(opts_get_visitor(ov), &end_err);
error_propagate(&local_err, end_err);
out: out:
if (local_err) { if (local_err) {

2
tests/qemu-iotests/149
View File

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/env python
# #
# Copyright (C) 2016 Red Hat, Inc. # Copyright (C) 2016 Red Hat, Inc.
# #