Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
angle
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
angle
Commits
45494d46
Commit
45494d46
authored
May 31, 2013
by
Geoff Lang
Committed by
Shannon Woods
Jun 26, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix potential segfault when calling glBufferData with NULL data pointer.
TRAC #23311 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods Authored-by: Geoff Lang
parent
f576cb24
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
12 deletions
+31
-12
BufferStorage11.cpp
src/libGLESv2/renderer/BufferStorage11.cpp
+27
-11
BufferStorage9.cpp
src/libGLESv2/renderer/BufferStorage9.cpp
+4
-1
No files found.
src/libGLESv2/renderer/BufferStorage11.cpp
View file @
45494d46
...
@@ -160,12 +160,20 @@ void BufferStorage11::setData(const void* data, unsigned int size, unsigned int
...
@@ -160,12 +160,20 @@ void BufferStorage11::setData(const void* data, unsigned int size, unsigned int
bufferDesc
.
MiscFlags
=
0
;
bufferDesc
.
MiscFlags
=
0
;
bufferDesc
.
StructureByteStride
=
0
;
bufferDesc
.
StructureByteStride
=
0
;
D3D11_SUBRESOURCE_DATA
initialData
;
if
(
data
)
initialData
.
pSysMem
=
data
;
{
initialData
.
SysMemPitch
=
size
;
D3D11_SUBRESOURCE_DATA
initialData
;
initialData
.
SysMemSlicePitch
=
0
;
initialData
.
pSysMem
=
data
;
initialData
.
SysMemPitch
=
size
;
initialData
.
SysMemSlicePitch
=
0
;
result
=
device
->
CreateBuffer
(
&
bufferDesc
,
&
initialData
,
&
mStagingBuffer
);
}
else
{
result
=
device
->
CreateBuffer
(
&
bufferDesc
,
NULL
,
&
mStagingBuffer
);
}
result
=
device
->
CreateBuffer
(
&
bufferDesc
,
&
initialData
,
&
mStagingBuffer
);
if
(
FAILED
(
result
))
if
(
FAILED
(
result
))
{
{
return
gl
::
error
(
GL_OUT_OF_MEMORY
);
return
gl
::
error
(
GL_OUT_OF_MEMORY
);
...
@@ -173,7 +181,7 @@ void BufferStorage11::setData(const void* data, unsigned int size, unsigned int
...
@@ -173,7 +181,7 @@ void BufferStorage11::setData(const void* data, unsigned int size, unsigned int
mStagingBufferSize
=
size
;
mStagingBufferSize
=
size
;
}
}
else
else
if
(
data
)
{
{
D3D11_MAPPED_SUBRESOURCE
mappedResource
;
D3D11_MAPPED_SUBRESOURCE
mappedResource
;
result
=
context
->
Map
(
mStagingBuffer
,
0
,
D3D11_MAP_WRITE
,
0
,
&
mappedResource
);
result
=
context
->
Map
(
mStagingBuffer
,
0
,
D3D11_MAP_WRITE
,
0
,
&
mappedResource
);
...
@@ -211,12 +219,20 @@ void BufferStorage11::setData(const void* data, unsigned int size, unsigned int
...
@@ -211,12 +219,20 @@ void BufferStorage11::setData(const void* data, unsigned int size, unsigned int
mBufferSize
=
0
;
mBufferSize
=
0
;
}
}
D3D11_SUBRESOURCE_DATA
initialData
;
if
(
data
)
initialData
.
pSysMem
=
data
;
{
initialData
.
SysMemPitch
=
size
;
D3D11_SUBRESOURCE_DATA
initialData
;
initialData
.
SysMemSlicePitch
=
0
;
initialData
.
pSysMem
=
data
;
initialData
.
SysMemPitch
=
size
;
initialData
.
SysMemSlicePitch
=
0
;
result
=
device
->
CreateBuffer
(
&
bufferDesc
,
&
initialData
,
&
mBuffer
);
}
else
{
result
=
device
->
CreateBuffer
(
&
bufferDesc
,
NULL
,
&
mBuffer
);
}
result
=
device
->
CreateBuffer
(
&
bufferDesc
,
&
initialData
,
&
mBuffer
);
if
(
FAILED
(
result
))
if
(
FAILED
(
result
))
{
{
return
gl
::
error
(
GL_OUT_OF_MEMORY
);
return
gl
::
error
(
GL_OUT_OF_MEMORY
);
...
...
src/libGLESv2/renderer/BufferStorage9.cpp
View file @
45494d46
...
@@ -54,7 +54,10 @@ void BufferStorage9::setData(const void* data, unsigned int size, unsigned int o
...
@@ -54,7 +54,10 @@ void BufferStorage9::setData(const void* data, unsigned int size, unsigned int o
}
}
mSize
=
std
::
max
(
mSize
,
offset
+
size
);
mSize
=
std
::
max
(
mSize
,
offset
+
size
);
memcpy
(
reinterpret_cast
<
char
*>
(
mMemory
)
+
offset
,
data
,
size
);
if
(
data
)
{
memcpy
(
reinterpret_cast
<
char
*>
(
mMemory
)
+
offset
,
data
,
size
);
}
}
}
void
BufferStorage9
::
clear
()
void
BufferStorage9
::
clear
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment