Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA

This commit is contained in:
Mark Riddoch
2014-12-11 13:49:01 +00:00

View File

@ -179,7 +179,7 @@ gwbuf_clone(GWBUF *buf)
{ {
GWBUF *rval; GWBUF *rval;
if ((rval = (GWBUF *)malloc(sizeof(GWBUF))) == NULL) if ((rval = (GWBUF *)calloc(1,sizeof(GWBUF))) == NULL)
{ {
ss_dassert(rval != NULL); ss_dassert(rval != NULL);
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
@ -194,11 +194,8 @@ GWBUF *rval;
rval->start = buf->start; rval->start = buf->start;
rval->end = buf->end; rval->end = buf->end;
rval->gwbuf_type = buf->gwbuf_type; rval->gwbuf_type = buf->gwbuf_type;
rval->properties = NULL;
rval->hint = NULL;
rval->gwbuf_info = buf->gwbuf_info; rval->gwbuf_info = buf->gwbuf_info;
rval->gwbuf_bufobj = buf->gwbuf_bufobj; rval->gwbuf_bufobj = buf->gwbuf_bufobj;
rval->next = NULL;
rval->tail = rval; rval->tail = rval;
CHK_GWBUF(rval); CHK_GWBUF(rval);
return rval; return rval;