Skip to main content
Revision a04d08fc18e3dba21dfce71e55f0decb971f9b91 authored by Matt Caswell on 25 April 2016, 15:05:55 UTC, committed by Matt Caswell on 26 April 2016, 13:39:56 UTC
Ensure we check i2d_X509 return val
The i2d_X509() function can return a negative value on error. Therefore
we should make sure we check it.

Issue reported by Yuan Jochen Kang.

Reviewed-by: Emilia Käsper <emilia@openssl.org>
(cherry picked from commit 446ba8de9af9aa4fa3debc7c76a38f4efed47a62)
1 parent 1ee4541
Raw File
c_rle.c
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <openssl/objects.h>
#include <openssl/comp.h>

static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,
                              unsigned int olen, unsigned char *in,
                              unsigned int ilen);
static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,
                            unsigned int olen, unsigned char *in,
                            unsigned int ilen);

static COMP_METHOD rle_method = {
    NID_rle_compression,
    LN_rle_compression,
    NULL,
    NULL,
    rle_compress_block,
    rle_expand_block,
    NULL,
    NULL,
};

COMP_METHOD *COMP_rle(void)
{
    return (&rle_method);
}

static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,
                              unsigned int olen, unsigned char *in,
                              unsigned int ilen)
{
    /* int i; */

    if (ilen == 0 || olen < (ilen - 1)) {
        /* ZZZZZZZZZZZZZZZZZZZZZZ */
        return (-1);
    }

    *(out++) = 0;
    memcpy(out, in, ilen);
    return (ilen + 1);
}

static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,
                            unsigned int olen, unsigned char *in,
                            unsigned int ilen)
{
    int i;

    if (olen < (ilen - 1)) {
        /* ZZZZZZZZZZZZZZZZZZZZZZ */
        return (-1);
    }

    i = *(in++);
    if (i == 0) {
        memcpy(out, in, ilen - 1);
    }
    return (ilen - 1);
}
back to top