cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-12 16:45:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix backporting mistakes in previous 5 commits

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2016-01-08 15:24:46 +01:00
parent 40510a3a79
commit faae6d2019
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/bignum.c
View File

@ -889,7 +889,7 @@ int mpi_add_abs( mpi *X, const mpi *A, const mpi *B )
{ {
int ret; int ret;
size_t i, j; size_t i, j;
mpi_uint *o, *p, c, tmp; t_uint *o, *p, c, tmp;
if( X == B ) if( X == B )
{ {
@ -934,14 +934,6 @@ int mpi_add_abs( mpi *X, const mpi *A, const mpi *B )
} }
cleanup: cleanup:
<<<<<<< HEAD
if( &TB == B )
{
mpi_free( &TB );
}
=======
>>>>>>> 6c9226809370... Improved on the previous fix and added a test case to cover both types
return( ret ); return( ret );
} }