Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a0c5d439bc6f
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0a7e15d6b7ea
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 17, 2020

  1. Copy the full SHA
    0a7e15d View commit details
Showing with 4 additions and 5 deletions.
  1. +4 −5 scopeprotocols/EthernetProtocolDecoder.cpp
9 changes: 4 additions & 5 deletions scopeprotocols/EthernetProtocolDecoder.cpp
Original file line number Diff line number Diff line change
@@ -133,7 +133,7 @@ void EthernetProtocolDecoder::BytesToFrames(
}
}

Packet* pack = NULL;
Packet* pack = new Packet;

EthernetFrameSegment segment;
segment.m_type = EthernetFrameSegment::TYPE_INVALID;
@@ -160,7 +160,6 @@ void EthernetProtocolDecoder::BytesToFrames(
segment.m_data.push_back(0x55);

//Start a new packet
pack = new Packet;
pack->m_offset = starts[i];
}
break;
@@ -456,7 +455,7 @@ void EthernetProtocolDecoder::BytesToFrames(

pack->m_len = ends[i] - pack->m_offset;
m_packets.push_back(pack);
pack = NULL;
return;
}

break;
@@ -466,8 +465,8 @@ void EthernetProtocolDecoder::BytesToFrames(
}
}

if(pack)
delete pack;
//If we get here it wasn't a valid frame
delete pack;
}

Gdk::Color EthernetProtocolDecoder::GetColor(int i)