From cf3de06a3346854d770ba147f081e3b22e93c1bc Mon Sep 17 00:00:00 2001 From: Kozlov Dmitry Date: Thu, 24 Jan 2013 23:58:56 +0400 Subject: backport 1.7 * l2tp: Fix allocation checking when adding octets AVP * cli, tcp: Fix non-NULL terminated string reception * Fix va_end() missing calls * chap-secrets: implemented encryption * auth_pap: make messages like other auth modules * cli: check xmit_buf is not null at enter to write function * pppoe: implemented regular expression support * chap-secrets: implemented encryption * ippool: fixed initialization order * optional shaper compiling * ppp: dns/wins code cleanup --- accel-pppd/ctrl/l2tp/packet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'accel-pppd/ctrl/l2tp') diff --git a/accel-pppd/ctrl/l2tp/packet.c b/accel-pppd/ctrl/l2tp/packet.c index c9765ad4..d6eb66c0 100644 --- a/accel-pppd/ctrl/l2tp/packet.c +++ b/accel-pppd/ctrl/l2tp/packet.c @@ -482,7 +482,7 @@ int l2tp_packet_add_octets(struct l2tp_packet_t *pack, int id, const uint8_t *va attr->length = size; attr->val.octets = _malloc(size); - if (!attr->val.string) { + if (!attr->val.octets) { log_emerg("l2tp: out of memory\n"); mempool_free(attr); return -1; -- cgit v1.2.3