aboutsummaryrefslogtreecommitdiff
path: root/src/pj_malloc.c
diff options
context:
space:
mode:
authorAaron Puchert <aaronpuchert@alice-dsl.net>2017-10-19 14:04:35 +0200
committerThomas Knudsen <busstoptaktik@users.noreply.github.com>2017-10-19 14:04:35 +0200
commit3ef083767eaf975399243246605fddc40cc097f9 (patch)
treeb2c45357d24f2a13850bbc46fea781a583436fc0 /src/pj_malloc.c
parentfe3e7fd972682e3fec6926a7cc66ededeab55701 (diff)
downloadPROJ-3ef083767eaf975399243246605fddc40cc097f9.tar.gz
PROJ-3ef083767eaf975399243246605fddc40cc097f9.zip
Prevent crashes and leaks on allocation failure (#606)
* Prevent crashes and leaks on allocation failure Memory allocation can fail. We need to gracefully handle this case and prevent dereferencing null pointers. * Make NULL checks consistent within a file * Properly report allocation errors * Improve cleanup in pj_gc_reader.c * Implement pj_strdup and use instead of strdup The function strdup is not part of ANSI C 89, but a POSIX extension. Therefore we can not rely on it being available on all platforms.
Diffstat (limited to 'src/pj_malloc.c')
-rw-r--r--src/pj_malloc.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/pj_malloc.c b/src/pj_malloc.c
index 4e465c46..c003c717 100644
--- a/src/pj_malloc.c
+++ b/src/pj_malloc.c
@@ -130,6 +130,16 @@ pointer" to signal an error in a multi level allocation:
return 0;
}
+/**********************************************************************/
+char *pj_strdup(const char *str)
+/**********************************************************************/
+{
+ size_t len = strlen(str) + 1;
+ char *dup = pj_malloc(len);
+ if (dup)
+ memcpy(dup, str, len);
+ return dup;
+}
/*****************************************************************************/