From 007194d6740383bb364a1445dea84da3e292df7b Mon Sep 17 00:00:00 2001
From: mpc <mpc>
Date: Wed, 11 Aug 2004 04:39:17 +0000
Subject: [PATCH] Check mallocs for NULL return
---
apps/sam/c/src/sam.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/apps/sam/c/src/sam.c b/apps/sam/c/src/sam.c
index b1f25af9e0..e413dac6c7 100644
--- a/apps/sam/c/src/sam.c
+++ b/apps/sam/c/src/sam.c
@@ -316,6 +316,10 @@ static void sam_parse(sam_sess_t *session, char *s)
data is sent, the extra NUL character will
just be ignored by the client program,
because it is not added to the size */
+ if (data == NULL) {
+ SAMLOGS("Out of memory");
+ abort();
+ }
if (sam_read2(session, data, size) != -1) {
p = data + size;
*p = '\0'; /* see above NUL note */
@@ -450,6 +454,10 @@ static void sam_parse(sam_sess_t *session, char *s)
data is sent, the extra NUL character will
just be ignored by the client program,
because it is not added to the size */
+ if (data == NULL) {
+ SAMLOGS("Out of memory");
+ abort();
+ }
if (sam_read2(session, data, size) != -1) {
p = data + size;
*p = '\0'; /* see above NUL note */
@@ -746,7 +754,15 @@ static sam_sendq_t *sam_sendq_create()
sam_sendq_t *sendq;
sendq = malloc(sizeof(sam_sendq_t));
+ if (sendq == NULL) {
+ SAMLOGS("Out of memory");
+ abort();
+ }
sendq->data = malloc(SAM_STREAM_PAYLOAD_MAX);
+ if (sendq->data == NULL) {
+ SAMLOGS("Out of memory");
+ abort();
+ }
/* ^^ a waste of memory perhaps, but more efficient than realloc'ing every
* time data is added the to queue */
sendq->size = 0;
@@ -781,8 +797,13 @@ void sam_sendq_flush(sam_sess_t *session, sam_sid_t stream_id,
*/
sam_sess_t *sam_session_init(sam_sess_t *session)
{
- if (session == NULL)
+ if (session == NULL) {
session = malloc(sizeof(sam_sess_t));
+ if (session == NULL) {
+ SAMLOGS("Out of memory");
+ abort();
+ }
+ }
session->connected = false;
session->prev_id = 0;
--
GitLab