OSDN Git Service
(root)
/
pf3gnuchains
/
pf3gnuchains4x.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e41f4d9
)
* cygheap.cc (_crealloc): Avoid memcpy when _cmalloc returns NULL.
author
cgf
<cgf>
Fri, 23 Nov 2007 16:37:05 +0000
(16:37 +0000)
committer
cgf
<cgf>
Fri, 23 Nov 2007 16:37:05 +0000
(16:37 +0000)
winsup/cygwin/ChangeLog
patch
|
blob
|
history
winsup/cygwin/cygheap.cc
patch
|
blob
|
history
diff --git
a/winsup/cygwin/ChangeLog
b/winsup/cygwin/ChangeLog
index
1e5c7cd
..
73530df
100644
(file)
--- a/
winsup/cygwin/ChangeLog
+++ b/
winsup/cygwin/ChangeLog
@@
-1,3
+1,7
@@
+2007-11-23 Christopher Faylor <me+cygwin@cgf.cx>
+
+ * cygheap.cc (_crealloc): Avoid memcpy when _cmalloc returns NULL.
+
2007-11-08 Christopher Faylor <me+cygwin@cgf.cx>
* dllfixdbg: Eliminate extra objcopy step.
diff --git
a/winsup/cygwin/cygheap.cc
b/winsup/cygwin/cygheap.cc
index
3b4b72b
..
c254341
100644
(file)
--- a/
winsup/cygwin/cygheap.cc
+++ b/
winsup/cygwin/cygheap.cc
@@
-232,8
+232,11
@@
_crealloc (void *ptr, unsigned size)
if (size <= oldsize)
return ptr;
newptr = _cmalloc (size);
- memcpy (newptr, ptr, oldsize);
- _cfree (ptr);
+ if (newptr)
+ {
+ memcpy (newptr, ptr, oldsize);
+ _cfree (ptr);
+ }
}
return newptr;
}