Changeset 1060:ddaf199fe8d6 in roaraudio

Timestamp:

12/24/08 12:40:31 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

corrected bug with from_size > to_size

File:

• libroardsp/convert.c (modified) (5 diffs)

libroardsp/convert.c

@@ -574 +574 @@
 int roar_conv       (void * out, void * in, int samples, struct roar_audio_info * from, struct roar_audio_info * to) {
  void * ip = in;
- void * real_out;
+ void * real_out = NULL;
  size_t from_size, to_size;
 
@@ -581 +581 @@
  //       for the moment: guess out >= in
 
- from_size = from->channels * from->bits * samples / 8;
- to_size   =   to->channels *   to->bits * samples / 8;
+ from_size = (from->bits * samples) / 8;
+ to_size   = (  to->bits * samples) / 8;
 
  if ( to_size < from_size ) {
@@ -589 +589 @@
   if ( (out = malloc(from_size)) == NULL )
    return -1;
+
+  ROAR_DBG("roar_conv(*): malloc(%i)=%p", (int)from_size, out);
  }
 
@@ -635 +637 @@
  if ( from->rate != to->rate ) {
   if ( roar_conv_rate(out, ip, samples, from->rate, to->rate, to->bits, from->channels) == -1 ) {
-   if ( to_size < from_size )
-    free(out);
+   ROAR_DBG("roar_conv(*): failed to convert rate %i->%i (%ich%ibits)", from->rate, to->rate, to->bits, from->channels);
    return -1;
   } else {
@@ -664 +665 @@
 
  if ( to_size < from_size ) {
+  ROAR_DBG("roar_conv(*): memcpy(%p, %p, %i) = ?", real_out, out, (int)to_size);
   memcpy(real_out, out, to_size);
   free(out);