[dss-commits] digitalSTROM Server branch, master, updated. 793b035827ecac85a7dd9a1815fbe7ecff1fe6f9

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM Server".

The branch, master has been updated
       via  793b035827ecac85a7dd9a1815fbe7ecff1fe6f9 (commit)
      from  5a1ac488291a974744f6cc828b4ec293af03021b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 793b035827ecac85a7dd9a1815fbe7ecff1fe6f9
Author: Patrick Stählin <pstaehlin at futurelab.ch>
Date:   Thu Jan 21 13:01:22 2010 +0100

    Check pointer before accessing it
    
    Fixes #275

-----------------------------------------------------------------------

Changes:
diff --git a/core/ds485/ds485.cpp b/core/ds485/ds485.cpp
index a74f081..b2202a6 100644
--- a/core/ds485/ds485.cpp
+++ b/core/ds485/ds485.cpp
@@ -467,8 +467,10 @@ namespace dss {
                 boost::shared_ptr<DS485Frame> ackFrame(m_FrameReader.getFrame(50));
 
                 DS485CommandFrame* cmdAckFrame = dynamic_cast<DS485CommandFrame*>(ackFrame.get());
-                if (cmdAckFrame->getHeader().getSource() == m_StationID) {
-                  ackFrame.reset( m_FrameReader.getFrame(50) );
+                if(cmdAckFrame != NULL) {
+                  if(cmdAckFrame->getHeader().getSource() == m_StationID) {
+                    ackFrame.reset( m_FrameReader.getFrame(50) );
+                  }
                 }
 
                 cmdAckFrame = dynamic_cast<DS485CommandFrame*>(ackFrame.get());


hooks/post-receive
-- 
digitalSTROM Server