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: 0411814c94f2
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c170516026ed
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 10, 2020

  1. EyeDecoder2: don't segfault if given invalid inputs. Fixes #63.

    @azonenberg
    azonenberg committed Mar 10, 2020
    Copy the full SHA
    c170516 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 scopehal/LeCroyOscilloscope.cpp
  2. +2 −2 scopeprotocols/EyeDecoder2.cpp
2 changes: 1 addition & 1 deletion scopehal/LeCroyOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -1326,8 +1326,8 @@ bool LeCroyOscilloscope::AcquireData(bool toQueue)
int num_samples = atoi(tmp.c_str());
//LogDebug("Expecting %d samples\n", num_samples);

//TODO: how do we parse this??
/*
Nanoseconds since Jan 1 2000. Use this instead?
tmp = data.substr(data.find("<FirstEventTime>") + 16);
tmp = tmp.substr(0, tmp.find("</FirstEventTime>"));
*/
4 changes: 2 additions & 2 deletions scopeprotocols/EyeDecoder2.cpp
View file
Original file line number Diff line number Diff line change
@@ -173,8 +173,8 @@ void EyeDecoder2::SetDefaultName()
{
char hwname[256];
snprintf(hwname, sizeof(hwname), "Eye(%s, %s)",
m_channels[0]->m_displayname.c_str(),
m_channels[1]->m_displayname.c_str());
(m_channels[0] == NULL) ? "NULL" : m_channels[0]->m_displayname.c_str(),
(m_channels[1] == NULL) ? "NULL" : m_channels[1]->m_displayname.c_str());
m_hwname = hwname;
m_displayname = m_hwname;
}