Commit b7db108c authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Pcbnew: fix potential bug in connections calculations (see Bug #909298 ).

parent 1cb1e88e

pcbnew/class_board.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1583,12 +1583,12 @@ D_PAD* BOARD::GetPad( std::vector<D_PAD*>& aPadList, const wxPoint& aPosition, i 
    int idxmax = aPadList.size()-1;



    int delta = aPadList.size();

    if( delta & 1 && delta > 1 )

        delta += 1;

    delta /= 2;

    int idx = delta;        // Starting index is the middle of list



    int idx = 0;        // Starting index is the beginning of list

    while( delta )

    {

        // Calculate half size of remaining interval to test.

        // Ensure the computed value is not truncated (too small)

        if( (delta & 1) && ( delta > 1 ) )

            delta++;

        delta /= 2;

pcbnew/connect.cpp

+8 −8
Original line number Diff line number Diff line
@@ -342,12 +342,12 @@ void CONNECTIONS::CollectItemsNearTo( std::vector<CONNECTED_POINT*>& aList, 
    int idxmax = m_candidates.size()-1;



    int delta = m_candidates.size();

    if( delta & 1 && delta > 1 )

        delta += 1;

    delta /= 2;

    int idx = delta;        // Starting index is the middle of list



    int idx = 0;        // Starting index is the beginning of list

    while( delta )

    {

        // Calculate half size of remaining interval to test.

        // Ensure the computed value is not truncated (too small)

        if( (delta & 1) && ( delta > 1 ) )

            delta++;

        delta /= 2;
@@ -530,12 +530,12 @@ int CONNECTIONS::searchEntryPointInCandidatesList( const wxPoint & aPoint) 
    int idxmax = m_candidates.size()-1;



    int delta = m_candidates.size();

    if( delta & 1 && delta > 1 )

        delta += 1;

    delta /= 2;

    int idx = delta;        // Starting index is the middle of list



    int idx = 0;        // Starting index is the beginning of list

    while( delta )

    {

        // Calculate half size of remaining interval to test.

        // Ensure the computed value is not truncated (too small)

        if( (delta & 1) && ( delta > 1 ) )

            delta++;

        delta /= 2;