upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-13 15:09:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[v9_10] misc x64 VS 2015 CTP fixes [#39308]

Browse source 
(cherry picked from commit ab973ec40c)
This commit is contained in:
Evan Hunt 2015-04-17 15:32:05 -07:00
parent e35b1b4612
commit 0fdcf394cb
7 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
4105. [port] Misc fixes for Microsoft Visual Studio
2015 CTP6 in 64 bit mode. [RT #39308]
4104. [bug] Address uninitialized elements. [RT #39252]
4102. [bug] Fix a use after free bug introduced in change

2
bin/named/client.c
View file

@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: client.c,v 1.286 2012/01/31 23:47:30 tbox Exp $ */
#include <config.h>
#include <isc/formatcheck.h>

2
bin/named/win32/os.c
View file

@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: os.c,v 1.39 2012/02/06 23:46:44 tbox Exp $ */
#include <config.h>
#include <stdarg.h>

2
lib/dns/rdata.c
View file

@ -1399,7 +1399,7 @@ multitxt_fromtext(isc_textregion_t *source, isc_buffer_t *target) {
if (escape)
return (DNS_R_SYNTAX);
isc_buffer_add(target, t - t0);
isc_buffer_add(target, (unsigned int)(t - t0));
} while (n != 0);
return (ISC_R_SUCCESS);
}

2
lib/dns/view.c
View file

@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id$ */
/*! \file */
#include <config.h>

5
lib/isc/entropy.c
View file

@ -319,7 +319,12 @@ entropypool_adddata(isc_entropy_t *ent, void *p, unsigned int len,
unsigned long addr;
isc_uint8_t *buf;
/* Silly MSVC in 64 bit mode complains here... */
#ifdef _WIN64
addr = (unsigned long)((unsigned long long)p);
#else
addr = (unsigned long)p;
#endif
buf = p;
if ((addr & 0x03U) != 0U) {

4
lib/isccc/cc.c
View file

@ -189,7 +189,7 @@ table_towire(isccc_sexpr_t *alist, isccc_region_t *target)
isccc_sexpr_t *kv, *elt, *k, *v;
char *ks;
isc_result_t result;
size_t len;
unsigned int len;
for (elt = isccc_alist_first(alist);
elt != NULL;
@ -198,7 +198,7 @@ table_towire(isccc_sexpr_t *alist, isccc_region_t *target)
k = ISCCC_SEXPR_CAR(kv);
ks = isccc_sexpr_tostring(k);
v = ISCCC_SEXPR_CDR(kv);
len = strlen(ks);
len = (unsigned int)strlen(ks);
INSIST(len <= 255U);
/*
* Emit the key name.