Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61205a3b authored by Bart Sears's avatar Bart Sears Committed by Android Git Automerger
Browse files

am 5c4a35a9: resolved conflicts for merge of c1fdbd41 to mnc-dr-dev-plus-aosp 

* commit '5c4a35a9':
  libstagefright: fix possible overflow in amrwbenc.
parents d56699a3 5c4a35a9

media/libstagefright/codecs/amrwbenc/src/util.c

+9 −4
Original line number Diff line number Diff line
@@ -35,9 +35,10 @@ void Set_zero( 
	     )

{

	Word32 num = (Word32)L;

	do{

	while (num > 0) {

		*x++ = 0;

	}while(--num !=0);

                --num;

	}

}
@@ -54,18 +55,22 @@ void Copy( 
	 )

{

	Word32	temp1,temp2,num;

        if (L <= 0) {

                return;

        }

	if(L&1)

	{

		temp1 = *x++;

		*y++ = temp1;

	}

	num = (Word32)(L>>1);

	do{

	while (num > 0) {

		temp1 = *x++;

		temp2 = *x++;

		*y++ = temp1;

		*y++ = temp2;

	}while(--num!=0);

                --num;

	}

}