From 294e66039e52f9a869066c7d9d6a0f1043e5976c Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@bnl.gov>
Date: Fri, 26 Aug 2011 16:33:57 -0700
Subject: [PATCH] epicsRingBytes avoid cantProceed

---
 src/libCom/ring/epicsRingBytes.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libCom/ring/epicsRingBytes.c b/src/libCom/ring/epicsRingBytes.c
index 4ab883fd7..f116a838a 100644
--- a/src/libCom/ring/epicsRingBytes.c
+++ b/src/libCom/ring/epicsRingBytes.c
@@ -19,7 +19,6 @@
 
 #define epicsExportSharedSymbols
 #include "dbDefs.h"
-#include "cantProceed.h"
 #include "epicsRingBytes.h"
 
 /*
@@ -39,9 +38,11 @@ typedef struct ringPvt {
 
 epicsShareFunc epicsRingBytesId  epicsShareAPI epicsRingBytesCreate(int size)
 {
-    ringPvt *pring = mallocMustSucceed(sizeof(ringPvt),"epicsRingBytesCreate");
+    ringPvt *pring = malloc(sizeof(ringPvt) + size + SLOP);
+    if(!pring)
+        return NULL;
     pring->size = size + SLOP;
-    pring->buffer = mallocMustSucceed(pring->size,"ringCreate");
+    pring->buffer = (char*)&pring[1];
     pring->nextGet = 0;
     pring->nextPut = 0;
     return((void *)pring);
@@ -50,7 +51,6 @@ epicsShareFunc epicsRingBytesId  epicsShareAPI epicsRingBytesCreate(int size)
 epicsShareFunc void epicsShareAPI epicsRingBytesDelete(epicsRingBytesId id)
 {
     ringPvt *pring = (ringPvt *)id;
-    free((void *)pring->buffer);
     free((void *)pring);
 }