Merge lp:~ralph-lange/epics-base/compress-fix into lp:~epics-core/epics-base/3.14

[Ralph Lange]

Fixed a crash when the ALG (algorithm) field was changed to "Average" at run time.

Fixes bug #552803.

Test by running a single compress record linked to an ai, and set the ALG field to "Average".

[Ralph Lange (ralph-lange)]

(This is trivial. I use it as an example learning how to handle bzr branches, LP bugs, merging etc.)

[Andrew Johnson (anj)]

Your commit was made by 'Ralph Lange <rlange@controldev32>' whom LP doesn't know.
You might want to re-do it after running
    bzr whoami "Ralph Lange <...@...>"
to fix that.

The content looks fine though.

[lp:~ralph-lange/epics-base/compress-fix]

12046. By Ralph Lange on 2010-04-02

Fixed crash when ALG (algorithm) was changed to Average at runtime. (Fixes #552803)

[Ralph Lange (ralph-lange)]

Should be fixed now.
(uncommit / commit / push --overwrite)

On Fri 02 Apr 2010 17:16:41 Andrew Johnson wrote:
> Your commit was made by 'Ralph Lange <rlange@controldev32>' whom LP doesn't know.
> You might want to re-do it after running
> bzr whoami "Ralph Lange <...@...>"
> to fix that.
>
> The content looks fine though.
>
>

[Andrew Johnson (anj)]

Looks good to me, here's an "approve".

review: Approve

[Ralph Lange (ralph-lange)]

Oh, I can set the status myself, but how does the actual merge happen?

[Ralph Lange (ralph-lange)]

I can do it myself ... yay!
Call it a week, then. Happy Easter!

=== modified file 'src/rec/compressRecord.c'
--- src/rec/compressRecord.c	2009-04-02 21:41:45 +0000
+++ src/rec/compressRecord.c	2010-04-02 21:28:27 +0000
@@ -80,10 +80,14 @@
 static void reset(compressRecord *prec)
 {
     prec->nuse = 0;
-    prec->off= 0;
+    prec->off = 0;
     prec->inx = 0;
     prec->cvb = 0.0;
     prec->res = 0;
+    /* allocate memory for the summing buffer for conversions requiring it */
+    if (prec->alg == compressALG_Average && prec->sptr == 0){
+        prec->sptr = (double *)calloc(prec->nsam,sizeof(double));
+    }
 }
 
 static void monitor(compressRecord *prec)
@@ -292,10 +296,6 @@
     if (pass==0){
 	if(prec->nsam<1) prec->nsam = 1;
 	prec->bptr = (double *)calloc(prec->nsam,sizeof(double));
-	/* allocate memory for the summing buffer for conversions requiring it */
-	if (prec->alg == compressALG_Average){
-                prec->sptr = (double *)calloc(prec->nsam,sizeof(double));
-	}
         reset(prec);
     }
     return(0);