Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
6330b25d
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
6330b25d
编写于
11月 13, 2017
作者:
I
igerasim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8188855: Fix VS10 build after "8187658: Bigger buffer for GetAdaptersAddresses"
Reviewed-by: vtewari, simonis
上级
8969c079
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
3 deletion
+7
-3
src/windows/native/java/net/NetworkInterface_winXP.c
src/windows/native/java/net/NetworkInterface_winXP.c
+7
-3
未找到文件。
src/windows/native/java/net/NetworkInterface_winXP.c
浏览文件 @
6330b25d
/*
* Copyright (c) 2003, 201
5
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 201
7
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -83,6 +83,9 @@ static int getAdapters (JNIEnv *env, IP_ADAPTER_ADDRESSES **adapters) {
DWORD
ret
,
flags
;
IP_ADAPTER_ADDRESSES
*
adapterInfo
;
ULONG
len
;
int
try
;
adapterInfo
=
(
IP_ADAPTER_ADDRESSES
*
)
malloc
(
BUFF_SIZE
);
if
(
adapterInfo
==
NULL
)
{
JNU_ThrowByName
(
env
,
"java/lang/OutOfMemoryError"
,
...
...
@@ -96,7 +99,7 @@ static int getAdapters (JNIEnv *env, IP_ADAPTER_ADDRESSES **adapters) {
flags
|=
GAA_FLAG_INCLUDE_PREFIX
;
ret
=
GetAdaptersAddresses
(
AF_UNSPEC
,
flags
,
NULL
,
adapterInfo
,
&
len
);
for
(
int
try
=
0
;
ret
==
ERROR_BUFFER_OVERFLOW
&&
try
<
MAX_TRIES
;
++
try
)
{
for
(
try
=
0
;
ret
==
ERROR_BUFFER_OVERFLOW
&&
try
<
MAX_TRIES
;
++
try
)
{
IP_ADAPTER_ADDRESSES
*
newAdapterInfo
=
NULL
;
if
(
len
<
(
ULONG_MAX
-
BUFF_SIZE
))
{
len
+=
BUFF_SIZE
;
...
...
@@ -133,6 +136,7 @@ IP_ADAPTER_ADDRESSES *getAdapter (JNIEnv *env, jint index) {
DWORD
flags
,
val
;
IP_ADAPTER_ADDRESSES
*
adapterInfo
,
*
ptr
,
*
ret
;
ULONG
len
;
int
try
;
adapterInfo
=
(
IP_ADAPTER_ADDRESSES
*
)
malloc
(
BUFF_SIZE
);
if
(
adapterInfo
==
NULL
)
{
JNU_ThrowByName
(
env
,
"java/lang/OutOfMemoryError"
,
...
...
@@ -144,7 +148,7 @@ IP_ADAPTER_ADDRESSES *getAdapter (JNIEnv *env, jint index) {
flags
|=
GAA_FLAG_SKIP_MULTICAST
;
flags
|=
GAA_FLAG_INCLUDE_PREFIX
;
val
=
GetAdaptersAddresses
(
AF_UNSPEC
,
flags
,
NULL
,
adapterInfo
,
&
len
);
for
(
int
try
=
0
;
val
==
ERROR_BUFFER_OVERFLOW
&&
try
<
MAX_TRIES
;
++
try
)
{
for
(
try
=
0
;
val
==
ERROR_BUFFER_OVERFLOW
&&
try
<
MAX_TRIES
;
++
try
)
{
IP_ADAPTER_ADDRESSES
*
newAdapterInfo
=
NULL
;
if
(
len
<
(
ULONG_MAX
-
BUFF_SIZE
))
{
len
+=
BUFF_SIZE
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录