am 248cca43: Merge "Enable clang integrated assembler except the arm target."
* commit '248cca4309ce245aea94b4467691a5c2afebf933':
Enable clang integrated assembler except the arm target.
diff --git a/Tremolo/codebook.c b/Tremolo/codebook.c
index 0ff3529..66979dc 100644
--- a/Tremolo/codebook.c
+++ b/Tremolo/codebook.c
@@ -210,6 +210,20 @@
}
}
+ // following sanity check copied from libvorbis
+ /* sanity check the huffman tree; an underpopulated tree must be
+ rejected. The only exception is the one-node pseudo-nil tree,
+ which appears to be underpopulated because the tree doesn't
+ really exist; there's only one possible 'codeword' or zero bits,
+ but the above tree-gen code doesn't mark that. */
+ if(b->used_entries != 1){
+ for(i=1;i<33;i++)
+ if(marker[i] & (0xffffffffUL>>(32-i))){
+ return 1;
+ }
+ }
+
+
return 0;
}
diff --git a/Tremolo/floor1.c b/Tremolo/floor1.c
index a2a035b..4a4937d 100644
--- a/Tremolo/floor1.c
+++ b/Tremolo/floor1.c
@@ -232,8 +232,9 @@
if(n>x1)n=x1;
n -= x0;
- if (n <= 0)
+ if (n <= 0 || y0 < 0 || y0 > 255 || y1 < 0 || y1 > 255) {
return;
+ }
dy=y1-y0;
adx=x1-x0;
ady=abs(dy);
