diff options
| author | Michael Biebl <biebl@debian.org> | 2016-04-25 15:06:28 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-04-25 15:06:28 +0200 |
| commit | ba829a4f45f619431fa823c39c19046957958dce (patch) | |
| tree | 450b967a7a247b05b794574fd9859fd987b014b2 /libnm-core/crypto.c | |
| parent | 7cba9af6f00e73f211ec9b6c88474044b421ba14 (diff) | |
| parent | 78c3b8801ecf4975e5da1af3b10ae20dd2d876de (diff) | |
Merge tag 'upstream/1.2.0'
Upstream version 1.2.0
Diffstat (limited to 'libnm-core/crypto.c')
| -rw-r--r-- | libnm-core/crypto.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libnm-core/crypto.c b/libnm-core/crypto.c index ecbe6c6e..c27f5c0d 100644 --- a/libnm-core/crypto.c +++ b/libnm-core/crypto.c @@ -641,6 +641,9 @@ crypto_is_pkcs12_data (const guint8 *data, GError *local = NULL; gboolean success; + if (!data_len) + return FALSE; + g_return_val_if_fail (data != NULL, FALSE); if (!crypto_init (error)) |