diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2011-05-04 21:19:04 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2011-05-04 21:19:04 +0000 |
| commit | d621e6acbea361c0a7c454b018f09f87dbc75de5 (patch) | |
| tree | 54071908d341dd68235d7587606e255742236e9d /epan/dissectors/packet-ssl-utils.c | |
| parent | 669162b440d70e615284d8c504d64ec5bf947b1b (diff) | |
Cleanup: g_malloc can't return NULL, remove checks for them.
XXX, should this code use g_try_malloc instead?
svn path=/trunk/; revision=36988
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 9bca0c3ed2..794e3b710f 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -1764,10 +1764,6 @@ ssl_generate_keyring_material(SslDecryptSession*ssl_session) key_block.data_len = needed; key_block.data = g_malloc(needed); - if (!key_block.data) { - ssl_debug_printf("ssl_generate_keyring_material can't allocate key_block (len %d)\n", needed); - return -1; - } ssl_debug_printf("ssl_generate_keyring_material sess key generation\n"); if (PRF(ssl_session,&ssl_session->master_secret,"key expansion", &ssl_session->server_random,&ssl_session->client_random, |