From: Sylvain Rochet Date: Tue, 24 Mar 2015 21:21:40 +0100 Subject: [PATCH] pppd: Fix ccp_cilen calculated size if both deflate_correct and deflate_draft are enabled This fixes a bug where ccp_cilen() will return 4 bytes less than necessary for the addci buffer if both deflate_correct and deflate_draft are enabled. Signed-off-by: Sylvain Rochet Signed-off-by: Paul Mackerras Imported from ppp_2.4.7-2+4.1.debian.tar.xz Signed-off-by: Michael Olbrich --- pppd/ccp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pppd/ccp.c b/pppd/ccp.c index 5814f358eb44..7d7922afcfc0 100644 --- a/pppd/ccp.c +++ b/pppd/ccp.c @@ -676,7 +676,8 @@ ccp_cilen(f) ccp_options *go = &ccp_gotoptions[f->unit]; return (go->bsd_compress? CILEN_BSD_COMPRESS: 0) - + (go->deflate? CILEN_DEFLATE: 0) + + (go->deflate && go->deflate_correct? CILEN_DEFLATE: 0) + + (go->deflate && go->deflate_draft? CILEN_DEFLATE: 0) + (go->predictor_1? CILEN_PREDICTOR_1: 0) + (go->predictor_2? CILEN_PREDICTOR_2: 0) + (go->mppe? CILEN_MPPE: 0);