projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 5.9.0
[yaz-moved-to-github.git]
/
src
/
xmalloc.c
diff --git
a/src/xmalloc.c
b/src/xmalloc.c
index
b49d399
..
1dec219
100644
(file)
--- a/
src/xmalloc.c
+++ b/
src/xmalloc.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-14,6
+14,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <assert.h>
#include <yaz/log.h>
#include <yaz/xmalloc.h>
#include <yaz/log.h>
#include <yaz/xmalloc.h>
@@
-22,6
+23,9
@@
#define TRACE_XMALLOC 1
#endif
#define TRACE_XMALLOC 1
#endif
+/* treat any size >1/4 of max value of size_t to be an error */
+#define MALLOC_SIZE_MAX ((size_t)(-1) / 4)
+
static int log_level = 0;
static int log_level_initialized = 0;
static int log_level = 0;
static int log_level_initialized = 0;
@@
-46,7
+50,7
@@
void *xmalloc_d(size_t nbytes, const char *file, int line)
{
char *res;
struct dmalloc_info *dinfo;
{
char *res;
struct dmalloc_info *dinfo;
-
+
if (!log_level_initialized)
{
log_level = yaz_log_module_level("malloc");
if (!log_level_initialized)
{
log_level = yaz_log_module_level("malloc");
@@
-60,13
+64,13
@@
void *xmalloc_d(size_t nbytes, const char *file, int line)
dinfo->file[sizeof(dinfo->file)-1] = '\0';
dinfo->line = line;
dinfo->len = nbytes;
dinfo->file[sizeof(dinfo->file)-1] = '\0';
dinfo->line = line;
dinfo->len = nbytes;
-
+
dinfo->prev = 0;
dinfo->next = dmalloc_list;
if (dinfo->next)
dinfo->next->prev = dinfo;
dmalloc_list = dinfo;
dinfo->prev = 0;
dinfo->next = dmalloc_list;
if (dinfo->next)
dinfo->next->prev = dinfo;
dmalloc_list = dinfo;
-
+
memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
res += sizeof(*dinfo) + 8*sizeof(char);
memcpy(res + nbytes, tail, 8*sizeof(char));
memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
res += sizeof(*dinfo) + 8*sizeof(char);
memcpy(res + nbytes, tail, 8*sizeof(char));
@@
-107,7
+111,7
@@
void *xrealloc_d(void *p, size_t nbytes, const char *file, int line)
struct dmalloc_info *dinfo;
char *ptr = (char*) p;
char *res;
struct dmalloc_info *dinfo;
char *ptr = (char*) p;
char *res;
-
+
if (!log_level_initialized)
{
log_level = yaz_log_module_level("malloc");
if (!log_level_initialized)
{
log_level = yaz_log_module_level("malloc");
@@
-141,7
+145,7
@@
void *xrealloc_d(void *p, size_t nbytes, const char *file, int line)
dmalloc_list = dinfo->next;
if (dinfo->next)
dinfo->next->prev = dinfo->prev;
dmalloc_list = dinfo->next;
if (dinfo->next)
dinfo->next->prev = dinfo->prev;
-
+
if (!nbytes)
{
free(dinfo);
if (!nbytes)
{
free(dinfo);
@@
-163,7
+167,7
@@
void *xrealloc_d(void *p, size_t nbytes, const char *file, int line)
if (dmalloc_list)
dmalloc_list->prev = dinfo;
dmalloc_list = dinfo;
if (dmalloc_list)
dmalloc_list->prev = dinfo;
dmalloc_list = dinfo;
-
+
memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
res += sizeof(*dinfo) + 8*sizeof(char);
memcpy(res + nbytes, tail, 8*sizeof(char));
memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
res += sizeof(*dinfo) + 8*sizeof(char);
memcpy(res + nbytes, tail, 8*sizeof(char));
@@
-175,7
+179,7
@@
void *xcalloc_d(size_t nmemb, size_t size, const char *file, int line)
char *res;
struct dmalloc_info *dinfo;
size_t nbytes = nmemb * size;
char *res;
struct dmalloc_info *dinfo;
size_t nbytes = nmemb * size;
-
+
if (!log_level_initialized)
{
log_level = yaz_log_module_level("malloc");
if (!log_level_initialized)
{
log_level = yaz_log_module_level("malloc");
@@
-189,13
+193,13
@@
void *xcalloc_d(size_t nmemb, size_t size, const char *file, int line)
dinfo->file[sizeof(dinfo->file)-1] = '\0';
dinfo->line = line;
dinfo->len = nbytes;
dinfo->file[sizeof(dinfo->file)-1] = '\0';
dinfo->line = line;
dinfo->len = nbytes;
-
+
dinfo->prev = 0;
dinfo->next = dmalloc_list;
if (dinfo->next)
dinfo->next->prev = dinfo;
dmalloc_list = dinfo;
dinfo->prev = 0;
dinfo->next = dmalloc_list;
if (dinfo->next)
dinfo->next->prev = dinfo;
dmalloc_list = dinfo;
-
+
memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
res += sizeof(*dinfo) + 8*sizeof(char);
memcpy(res + nbytes, tail, 8*sizeof(char));
memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
res += sizeof(*dinfo) + 8*sizeof(char);
memcpy(res + nbytes, tail, 8*sizeof(char));
@@
-206,7
+210,7
@@
void xmalloc_trav_d(const char *file, int line)
{
size_t size = 0;
struct dmalloc_info *dinfo = dmalloc_list;
{
size_t size = 0;
struct dmalloc_info *dinfo = dmalloc_list;
-
+
if (!log_level_initialized)
{
log_level = yaz_log_module_level("malloc");
if (!log_level_initialized)
{
log_level = yaz_log_module_level("malloc");
@@
-230,7
+234,7
@@
void xmalloc_trav_d(const char *file, int line)
#define xmalloc_d(x, f, l) malloc(x)
#define xcalloc_d(x,y, f, l) calloc(x,y)
#define xfree_d(x, f, l) free(x)
#define xmalloc_d(x, f, l) malloc(x)
#define xcalloc_d(x,y, f, l) calloc(x,y)
#define xfree_d(x, f, l) free(x)
-#define xmalloc_trav_d(f, l)
+#define xmalloc_trav_d(f, l)
#endif
void xmalloc_trav_f(const char *s, const char *file, int line)
#endif
void xmalloc_trav_f(const char *s, const char *file, int line)
@@
-244,8
+248,9
@@
void xmalloc_trav_f(const char *s, const char *file, int line)
xmalloc_trav_d(file, line);
}
xmalloc_trav_d(file, line);
}
-void xmalloc_fatal(void)
+void xmalloc_fatal(size_t size)
{
{
+ assert(size < MALLOC_SIZE_MAX);
exit(1);
}
exit(1);
}
@@
-264,9
+269,9
@@
void *xrealloc_f(void *o, size_t size, const char *file, int line)
"%s:%d: xrealloc(s=%ld) %p -> %p", file, line, (long) size, o, p);
if (!p)
{
"%s:%d: xrealloc(s=%ld) %p -> %p", file, line, (long) size, o, p);
if (!p)
{
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "Out of memory, realloc (%ld bytes)",
- (long) size);
- xmalloc_fatal();
+ yaz_log(YLOG_FATAL, "%s:%d: Out of memory, realloc(%ld bytes)",
+ file, line, (long) size);
+ xmalloc_fatal(size);
}
return p;
}
}
return p;
}
@@
-274,7
+279,7
@@
void *xrealloc_f(void *o, size_t size, const char *file, int line)
void *xmalloc_f(size_t size, const char *file, int line)
{
void *p = xmalloc_d(size, file, line);
void *xmalloc_f(size_t size, const char *file, int line)
{
void *p = xmalloc_d(size, file, line);
-
+
if (!log_level_initialized)
{
log_level = yaz_log_module_level("malloc");
if (!log_level_initialized)
{
log_level = yaz_log_module_level("malloc");
@@
-282,14
+287,14
@@
void *xmalloc_f(size_t size, const char *file, int line)
}
if (log_level)
}
if (log_level)
- yaz_log(log_level, "%s:%d: xmalloc(s=%ld) %p", file, line,
+ yaz_log(log_level, "%s:%d: xmalloc(s=%ld) %p", file, line,
(long) size, p);
if (!p)
{
(long) size, p);
if (!p)
{
- yaz_log(YLOG_FATAL, "Out of memory - malloc (%ld bytes)",
- (long) size);
- xmalloc_fatal();
+ yaz_log(YLOG_FATAL, "%s:%d: Out of memory - malloc(%ld bytes)",
+ file, line, (long) size);
+ xmalloc_fatal(size);
}
return p;
}
}
return p;
}
@@
-309,9
+314,9
@@
void *xcalloc_f(size_t nmemb, size_t size, const char *file, int line)
if (!p)
{
if (!p)
{
- yaz_log(YLOG_FATAL, "Out of memory - calloc (%ld, %ld)",
- (long) nmemb, (long) size);
- xmalloc_fatal();
+ yaz_log(YLOG_FATAL, "%s:%d: Out of memory - calloc(%ld, %ld)",
+ file, line, (long) nmemb, (long) size);
+ xmalloc_fatal(size);
}
return p;
}
}
return p;
}
@@
-326,7
+331,7
@@
char *xstrdup_f(const char *s, const char *file, int line)
}
if (log_level)
}
if (log_level)
- yaz_log(log_level, "%s:%d: xstrdup(s=%ld) %p", file, line,
+ yaz_log(log_level, "%s:%d: xstrdup(s=%ld) %p", file, line,
(long) strlen(s)+1, p);
strcpy(p, s);
(long) strlen(s)+1, p);
strcpy(p, s);
@@
-352,7
+357,7
@@
char *xstrndup_f(const char *s, size_t n, const char *file, int line)
memcpy(a, s, n);
a[n] = '\0';
return a;
memcpy(a, s, n);
a[n] = '\0';
return a;
- }
+ }
}
/*
}
/*