Improve Class 1 handling when prologue frames fail after EOM

From Lee's work:
|  commit cdaf7f3b41170a76e2717863514df6368e51de7c
|  Author: Lee Howard <faxguy@howardsilvan.com>
|  Date:   Thu Jul 27 19:36:20 2006 +0000
|
|    this improves the error-handling for situations where Phase B fails
|    following EOM... notably it gets emsg into the info array

diff --git a/CHANGES b/CHANGES
index 31bae3ef082915cdb25fe73f4b816ac193dece62..0243339209eb90fea3a3f708bf74070ba1260af6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog since HylaFAX 4.3.3
 
+* Improve Class 1 handling when prologue frames fail after EOM (13 Mar 2007)
 * Improve and extend JPEG parsing (13 Mar 2007)
 * Restrict the usage of sending EOR, even when using MH and MR (13 Mar 2007)
 * Fix send buffer when transmitting non-ECM data with a non-zero

diff --git a/faxd/FaxRecv.c++ b/faxd/FaxRecv.c++
index 7ccc36f73102875392da0adfd66b301f90550f29..af218a1dd498906661fe13a30cdccf09e7248532 100644 (file)
--- a/faxd/FaxRecv.c++
+++ b/faxd/FaxRecv.c++
@@ -254,8 +254,12 @@ FaxServer::recvDocuments(TIFF* tif, FaxRecvInfo& info, FaxRecvInfoArray& docs, f
        if (tif == NULL)
            return (false);
        fileStart = pageStart = Sys::now();
-       if (!modem->recvEOMBegin(emsg))
+       if (!modem->recvEOMBegin(emsg)) {
+           info.reason = emsg;
+           docs[docs.length()-1] = info;
+           TIFFClose(tif);
            return (false);
+       }
     }
     /*NOTREACHED*/
 }