From 28a4e4d8a8dcc8dc416a63dbc516bf480e0319de Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Tue, 6 May 2014 11:39:27 +0200 Subject: [PATCH] catch ppt-dump errors to avoid bogus system reports --- src/filters/msodump.zip | Bin 115404 -> 115355 bytes src/filters/ppt-dump.py | 10 +++++++--- src/filters/xlsxmltocsv.py | 6 +++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/filters/msodump.zip b/src/filters/msodump.zip index 22a3e5cd3dd53809400288eb8ab77aa7315ad369..a1b6d9e61de90398da24afdb46f46058bb2100af 100644 GIT binary patch delta 5274 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 T-EG4}bpz!|q_Dt$s>uHUt?v-^ delta 5327 zcmV;=6fow6G_Mu zIf0kOBu+!VV2Owju77vbJ7RCPqF{GvnXfpzgi&^r<}rhJMY;StUr8oYCbyhPp2r1C z*YxGL^s|VffW0c0kyrti7h=Vef{)oJpUwTL&z`SYz*cFtuco|u!FEBxl2o!#6fzgf zQu2`PgxmsvC;-b^M1bNy(~_-%gr!Rv2>6q57D%?0GFzOS#D9vipXQqrKzRbhPJCEM zPsCZ8OIGZQF$3)7N{(3^$nBVY7MVi)5Jy=yW_Lh4**w4P^=?aJ?-^Y zQBV}@VlVk+ntbB9yw3A9_pTpSJd+|#Mhlh!gbfJjcn}|g(}2H$WTT6q;9g2n9W8o2 z1|K#0Yg))(vVZK&KI02|ji2AsJk*cpY+AiW5|Md5t6slKcRYWUibTTexk4WDHT&>E zBtm}pz`TM->oMCZQlpvzI1EIxe}9!0-5^PNN1CAaxf>=d9kn&Op{ZTU zv;^Ryxqq+p5-`(WcPOKcnl|=PeCF^r;)$p5)$}%8-r;Cde{wF%JgKMGGl22%f*8;& z0@{t-T64v^=H*xqv!82RH6(sGnROr0q7(HAm$FL0BTTx8(o>9Td;4%{xpJ_Wx3e5l#FtEdZSLw4yz2jGNWe zRKtM99K0!}7==!7AP5+1T&Gb45f#lH@|YRHvvm|~eA|&| zGN=Yf$#osoV7)?n`{tu=NgT8t#HU=Y!hZ^4c`a63j9p4F)v`yfn#buU4oTfEK#kV( zTSCUEu3&G(0}oY3(ca#7zuir4?|%K|_4U;~!%&TGaPH6jng5j4GizZbl0!I(Y-!we z$zq)cgv?8}Mcoxnt&87*E*KAAkJesXuKkALiAoM}b`gtB-b=yMIi} zM0Pol$$35A8DyTZsjC=HD0GNcyYvlokH1FuU`*?D!o8k$xc?DECBMzzCLfb@2fi+X zTz$+$_%Oy`7#ExKp;xNG(NHsnFqpgoMhSmtjuJ62R1fOWclVAe;kdm3AO$kRbb!#f zyzA}4k#_*7tb<2gWd8YIu0s+^3xD#xO$=xG+o1UHk?%b~_%(7p>#Y(;uZN}+sx)v3 z*)It)RT-xT0Aqm1Xrcu)nQ0n8U1ed7G_@IS46uy_(Xce9VoD>aGgWy1zUM5Wnh3dc z6Wmg*ec=}p9Jlm$xsV*0AKA-^lE>DgU=RYVt`EtM4XE)@Iz>{^lQd0uuYYOwDXUqq zJ|L;-t6JgFc~{pLZ~wAjg96hmHB*sHFg(13G@5w{{2yXsy1PxHy-B<2#S0M&ECHqu z^J!h=T+>{J(;!4Z5n2U|GRYv`KuHZTZnX{2#hB`cCMP)Bn~V*z+oI4#GP)SwlMpqlbG?oxBCf##zpx;^>0EFC?#aV48)U`c~3cfNXsv8U%q+%^6jH}SA_2s zk5nOofF<%HG|=&EG$t64pd%(uF&ka-eVR~(1~}s2LE)fb(tnIK%>FMG#C(sNivLSuLo^%vKRm1>d%YFq7LU@gQOFtMG;R#{I3s z39?{@MonL1O{q)md&362?$A!9TSx4dPbtVX-sd8~ePS^fWv~JLBAWx9=~J@nW!6WSQ^lHCv?#PJ1N7#*(Kv1b;WH;f@%H-}%QH`Z7_UFIQhK zzg&Fz<%=D_JVoNq5PGLG2uh%|sBunQp>@9E*bU67y;*HuD+Dz_>jo)s4KYA>RL>o< zb0P~=FDhtA314YX+Jrte(3dst0`&worH%W{KwtGL@T82d!QVQqFid<6mPSympbu?U z1>SW24u5)UNiKortWGkg7MUaVTKB`y!Rqjvjq#$*d3O|cUaBNjyZ1_qTepyQX|fWklq>L`ISgwH&O`i61_ z$Z|($(+MJtEF_-FHC|kg$c=G`Ty-*mStAry*nfBpSR+zdIF&}A;I>v~9Zq}Dal$v^dvq{>ODe*Y= zF$mE!*{?=zV|tS!A}sAR!6(j)o=cm($sxIdWs}S?faz5jQ90m(-U9A+*fs8Ptn|@o z1%G;t&L|p>#&qt+1y?ePL&^!kA0mgS<`j=2E{!&WXVs1v6p)*+)k0L6iRxQfvKqBu ztxC>(9uagb5*yvvE$2EuRnSvXxSxE3%s^SmXwJWRAs}VfyMlXd%eThcPO|mb$kiDT zPMz3723@7L8hp%###D!66|al)Va~HCSby6|mCY_X66 z>IhnoR+cf_aquw`EV`lCK6%9kGE}Kej!sZ@5Fud*xx{`My37=68>%4fLWewFQ}73k z9Y2b|*Mqc$&r@^$%pm0c>AVXmeh$W6^J&N515;-$pl^tLUDdA&h8=bd!ql|BmVeXK z=o9%oeE62Y`dIix^*tCul}S0niV@{kSd|sCpkUmo?5*BTBY|$vM_1KMXAfks)Exnr z&sz;pO0KOlxaLroLtzu0_}1M+(~)M4mbBf8@Avz#E_AOZ+UmduwdQt0ZFn6;DI-t^ z-erMj2fdf6x#ARBc%RfDMuX z9bhW55PS%i=J_8bhscDQFKbpU2Eh#l;omWW85qnu6w;oy19d2=`yt@P)_>rM>6O}0 zkYm-SdbFnamgFCO6Lwn(c2qTAhpVAwqXrSSkrbesTg;wbfEQ}!%m#IF6Xe$c)vRs; zu7^?CSZnr~wp*n`ugj#)gezBLv1UU(>IXnCpC{|oMW#8l%E=1q(KH&s^1w~gA3INS zz-yMDoU&s>v7@-ND(Z=aLVp*8sSKiv>NKg-zK<(p$M*bc^|XCfS!ts@t`o-UG_Y~Z zhB@(yGakS;ViOf3?!0+SDBX5f!?Vtxm@}`hWeFrkCtTGH3cQ8U$f4O~U1MlZI{BGV zvEjxt&0m8r!<8R$VtcsCX7eBC!^gU(N9-0{#*%M?Pa-XIUC!_ahJU^K@1W`QTs?Jc zXm5?_j3ZiokdM+wM^-Mc#3vDQ+g%?zr@-b%HK1?8be>(%6(OVL6^R$>EfO+hsxeGS zTmxuMtG=Jip6Z)au!LIeX+f2Ts>Ym5=LkZqcCFx5Q5t@eeZ_yU!_C2B>V*#mgU}y@;Q}7LS|DRf zIBtTaPlI6kKv;oITSqJW+RT;QMU;lYhGoBUG zgF1_A`BILh4S$8u>C_QI7G5!-0BhaNP}Iy<)i8OJmkrG@lI+8CTU>{?U-S80Dqu_Q z5HZNiJ9Ri9s0WwY#Vj4) zf;xvZnnxoR?Y=(mtWWjmZh_)_(cCk=hW1`L*wD4;Ov(Z5uAQZBf=@}yvaHC zl9#~}(0@P;4096Bv2qHMJ++dF3OR!vx&b=bMV15V_)^_W*E;Z!&_N9)Jfv5U2SCt( z2uj6Nh@D}HM^}(yN)Z9hA)Y^$@IOG0J!rbyA*9jkdcn?Fl97)^(Og%c>c~c| zwxv3WvwsNCvrcM@|JQqT@vqsVU;lM`^y0hs=q5^o#_oLIPWa!n7YF!VJNz1+%!S$i zBY&nshbg1WZ*I6&-V%IsHfALr2(mcHKY!vOBP>qOR(ELVC_pta?9DFi+e+Wk@vx${ zuWrJ5H0f+u{o+IQ{eI7b>}$7?##BA>ymcK_y~exr>d75mmefzJZd4&+y0oXUDrIV2 zbyBmA&$Y5uQ`b>hY+Ki(P&=qD5Q#nCFEUVI9DoF%>l&D*r3E>xd)?ms>G!Jn#gXJn8U8TE@xyx^$v9keZxtkdek?GeLst})%!D_Cr9 zaRu>GY|6AODzig&=wct>)_nT-9e*)-uI-8T5tWh8a58+db2|l%BBhd~RUesm6%WU( zzvvjZuvcSxCkiE0VjG20;d06Y^AhYN#6!5P*Y_Xds6WC+m%-%INxdF^_U|td)}wVzU3Uqw3vsHg@-h^@V;fd_@ zVTR9R)(He43Zip-q*p{-(VcaWxZzvF;KxK$cj$UbABwQ`H`-?hg9Wy*vDd8xXX<@BWl(Gst1XW? z&G5Q;u@=!m_ViKgitX>0#4{LQjh3-YHh@n>&v>Yx5?`v_8~_dbbuffw=6 zma#Q(p6%rp57oC~EtT6oWktG{_+x09X7G(aWDuO;`=a;XP)h>@6q8>QG6ZF1%~G?K z6WH1tFSVO`Ervl@9D5d?#g%~G>DitYyllyJ>bvn!J7 z2Lu{y%~G=&n%)rvgOSZrv-_(a76gM$&Qh}-!h)9s%QwwZx1(7B#UBKNk z6$FEk%~H21j{#3A1cQ;yQn!4$0jUE6EFI04kiG#N4p)jOL;@w|_B|5-06jgIQoR8! z17>>7myo^z9G9NG0UiO1m%Y6KRRL(16TSgk0unTraJ~Ur0t$JT%)S9y0xgP{D8B(# z0w9u?fWHA%0t%X!*S`T-0qd7BzyVtV4Z@d>zyVqVlUV_me^~(;mjuB9KmlHtMZp1C h0vnH)puquH0c@A~!2w$W8oifR!T~=9X}tje001v31y29~ diff --git a/src/filters/ppt-dump.py b/src/filters/ppt-dump.py index d41c5891..6109eec4 100755 --- a/src/filters/ppt-dump.py +++ b/src/filters/ppt-dump.py @@ -116,9 +116,13 @@ def main (args): usage(exname) return - dumper = PPTDumper(args[0], globals.params) - if not dumper.dump(): - error("FAILURE\n") + try: + dumper = PPTDumper(args[0], globals.params) + if not dumper.dump(): + error("ppt-dump: dump error\n") + except: + error("ppt-dump: FAILURE (bad format?)\n") + if globals.params.dumpText: print(globals.textdump.replace("\r", "\n")) diff --git a/src/filters/xlsxmltocsv.py b/src/filters/xlsxmltocsv.py index 84b54c3b..f73fe853 100755 --- a/src/filters/xlsxmltocsv.py +++ b/src/filters/xlsxmltocsv.py @@ -45,4 +45,8 @@ class XlsXmlHandler(xml.sax.handler.ContentHandler): elif name == "worksheet": print("") -xml.sax.parse(sys.stdin, XlsXmlHandler()) +try: + xml.sax.parse(sys.stdin, XlsXmlHandler()) +except: + sys.exit(1) +sys.exit(0)