ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

3668. [bug] Fix cast in lex.c which could see 0xff treated as eof.

Browse Source 
[RT #34993]

(cherry picked from commit 0a47bc90af)
This commit is contained in:
Mark Andrews
2013-11-11 10:49:28 +11:00
parent dc4634ebc7
commit 0239dfa344
4 changed files with 80 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/isc/lex.c
View File

@@ -445,7 +445,7 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
c = EOF;
source->at_eof = ISC_TRUE;
} else {
c = *((char *)buffer->base +
c = *((unsigned char *)buffer->base +
buffer->current);
buffer->current++;
}

10
lib/isc/tests/Makefile.in
View File

@@ -36,12 +36,12 @@ LIBS = @LIBS@ @ATFLIBS@
OBJS = isctest.@O@
SRCS = isctest.c hash_test.c safe_test.c sockaddr_test.c \
SRCS = isctest.c hash_test.c test_lex.c safe_test.c sockaddr_test.c \
symtab_test.c parse_test.c
SUBDIRS =
TARGETS = hash_test@EXEEXT@ safe_test@EXEEXT@ sockaddr_test@EXEEXT@ \
symtab_test@EXEEXT@ parse_test@EXEEXT@
TARGETS = hash_test@EXEEXT@ test_lex.@EXEEXT@ safe_test@EXEEXT@ \
sockaddr_test@EXEEXT@ symtab_test@EXEEXT@ parse_test@EXEEXT@
@BIND9_MAKE_RULES@
@@ -53,6 +53,10 @@ symtab_test@EXEEXT@: symtab_test.@O@ isctest.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
symtab_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}
lex_test@EXEEXT@: lex_test.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
lex_test.@O@ ${ISCLIBS} ${LIBS}
parse_test@EXEEXT@: parse_test.@O@ isctest.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
parse_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}

69
lib/isc/tests/lex_test.c Normal file
View File

@@ -0,0 +1,69 @@
/*
* Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
#include <config.h>
#include <atf-c.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <isc/buffer.h>
#include <isc/lex.h>
#include <isc/mem.h>
#include <isc/util.h>
ATF_TC(lex);
ATF_TC_HEAD(lex, tc) {
atf_tc_set_md_var(tc, "descr", "check handling of 0xff");
}
ATF_TC_BODY(lex, tc) {
isc_mem_t *mctx = NULL;
isc_result_t result;
isc_lex_t *lex = NULL;
isc_buffer_t death_buf;
isc_token_t token;
unsigned char death[] = { EOF, 'A' };
UNUSED(tc);
result = isc_mem_create(0, 0, &mctx);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
result = isc_lex_create(mctx, 1024, &lex);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
isc_buffer_init(&death_buf, &death[0], sizeof(death));
isc_buffer_add(&death_buf, sizeof(death));
result = isc_lex_openbuffer(lex, &death_buf);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
result = isc_lex_gettoken(lex, 0, &token);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
}
/*
* Main
*/
ATF_TP_ADD_TCS(tp) {
ATF_TP_ADD_TC(tp, lex);
return (atf_no_error());
}