projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add #147: Improve 'Building from Source' section in the user manual
[privoxy.git]
/
miscutil.c
diff --git
a/miscutil.c
b/miscutil.c
index
f04344c
..
aebd55f
100644
(file)
--- a/
miscutil.c
+++ b/
miscutil.c
@@
-1,4
+1,4
@@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.7
7 2012/07/23 12:41:59
fabiankeil Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.7
9 2015/08/12 10:34:38
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $
@@
-8,7
+8,7
@@
const char miscutil_rcs[] = "$Id: miscutil.c,v 1.77 2012/07/23 12:41:59 fabianke
* to deserve their own file but don't really fit in
* any other file.
*
* to deserve their own file but don't really fit in
* any other file.
*
- * Copyright : Written by and Copyright (C) 2001-201
2
the
+ * Copyright : Written by and Copyright (C) 2001-201
6
the
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@
-151,6
+151,14
@@
void *malloc_or_die(size_t buffer_size)
{
char *new_buf;
{
char *new_buf;
+ if (buffer_size == 0)
+ {
+ log_error(LOG_LEVEL_ERROR,
+ "malloc_or_die() called with buffer size 0");
+ assert(buffer_size != 0);
+ buffer_size = 4096;
+ }
+
new_buf = malloc(buffer_size);
if (new_buf == NULL)
new_buf = malloc(buffer_size);
if (new_buf == NULL)