Changeset 172

Timestamp:

10/10/07 11:18:13 (11 months ago)

Author:

sip

Message:

Length check and signess correction.

Files:

• app_h324m/app_h324m.c (modified) (5 diffs)

app_h324m/app_h324m.c

@@ -131 +131 @@
-{
-        int mark = 0;
-
+
+
-        int found = 0;
-int len
+unsigned int len = 0
-        struct ast_frame* send;
-
@@ -148 +149 @@
-                                /* exit */
-                                return NULL;
+
-                        ast_log(LOG_DEBUG, "create_ast_frame: received AMR frame with %d bytes\n",framelength);
+
+                        /*Get header*/
+                        unsigned char header = framedata[0];
+                        /*Get mode*/
+                        unsigned char mode = header & 0x0F;
+                        /*Get number of stuffing bits*/
+                        unsigned int stuf = if2stuffing[mode];
+
+                        /*Get Block Size*/
+                        short bs = blockSize[mode];
+
+                        /* Check correct mode and length */
+                        if (bs==-1 || framelength<bs)
+                                /* Exit */
+                                return NULL;
+
-                        /* Create frame */
-                        send = (struct ast_frame *) malloc(sizeof(struct ast_frame) + AST_FRIENDLY_OFFSET + framelength + 3);
@@ -161 +179 @@
-                        /*Convert IF2 into AMR MIME format*/
-
-                        /*Get header*/
-                        unsigned char header = ((unsigned char *)(send->data+1))[0];
-                        /*Get mode*/
-                        unsigned char mode = header & 0x0F;
-                        /*Get number of stuffing bits*/
-                        unsigned int stuf = if2stuffing[mode];
-                        /*Get Block Size*/
-                        unsigned int bs = blockSize[mode];
-
-
-                        /*Reverse bytes*/
-                        TIFFReverseBits(send->data+1, framelength);
-
-/It amr has a byte more then if2
+*If amr has a byte more than if2 */
-                        if(stuf < 4)
-                        {
+                                /* Set last byte */
-                                ((unsigned char *)(send->data+1))[bs] = ((unsigned char *)(send->data+1))[bs - 1] << 4;
-                                /*Increase size of frame*/
@@ -182 +191 @@
-                        }
-                        
-
-
-
-
-
-
-
+
+
+
+
+
-                        ((unsigned char *)(send->data+1))[0] = mode << 3 | 0x04;
-
@@ -212 +219 @@
-                        i = 0;
-                        found = 0;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-