Skip to content

Commit

Permalink
add xygraph-crash-fix.patch
Browse files Browse the repository at this point in the history
  • Loading branch information
chrschroeder committed May 24, 2018
1 parent 6d1211c commit c469218
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 0 deletions.
44 changes: 44 additions & 0 deletions debian/patches/0012-xygraph-crash-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
diff --git a/baselib/xygraph.cc b/baselib/xygraph.cc
index f655342..f4b0e1b 100644
--- a/baselib/xygraph.cc
+++ b/baselib/xygraph.cc
@@ -6291,6 +6291,19 @@ int ctl;

if ( ctl ) return;

+ if ( xPvData[i] == NULL )
+ {
+ if ( debugMode() )
+ printf( "xyGraphClass::genChronoVector: trace %d NULL xPvData\n", i );
+ return;
+ }
+ if ( yPvData[i] == NULL )
+ {
+ if ( debugMode() )
+ printf( "xyGraphClass::genChronoVector: trace %d NULL yPvData\n", i );
+ return;
+ }
+
yi = 0;
if ( y2Scale[i] ) yi = 1;

@@ -6576,6 +6589,19 @@ int ctl;

if ( ctl ) return;

+ if ( xPvData[i] == NULL )
+ {
+ if ( debugMode() )
+ printf( "xyGraphClass::genXyVector: trace %d NULL xPvData\n", i );
+ return;
+ }
+ if ( yPvData[i] == NULL )
+ {
+ if ( debugMode() )
+ printf( "xyGraphClass::genXyVector: trace %d NULL yPvData\n", i );
+ return;
+ }
+
yi = 0;
if ( y2Scale[i] ) yi = 1;

1 change: 1 addition & 0 deletions debian/patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
0009-remove-unused-libXp.patch
0010-fix-fprintf-for-format-security-option.patch
0011-fix-macro-definition-for-giflib-5.1.patch
0012-xygraph-crash-fix.patch

0 comments on commit c469218

Please sign in to comment.