Ottomata has submitted this change and it was merged. Change subject: Fixed segfault ......................................................................
Fixed segfault Change-Id: I63871716ade4cc657720ad42ef03c6fd7741fceb --- A big-entry-1.txt M filter.c M test.sh 3 files changed, 21 insertions(+), 9 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/big-entry-1.txt b/big-entry-1.txt new file mode 100644 index 0000000..b92f0f3 --- /dev/null +++ b/big-entry-1.txt @@ -0,0 +1 @@ +amssq46.esams.wikimedia.org 183925014 2013-03-26T18:42:47.309 316 0.0.0.0 TCP_MISS/200 2646 GET http://es.wikipedia.org/w/api.php?action=query&prop=revisions&rvprop=content&titles=TKRBeneficioDif(%)IngresosDif(%)BPAEBITDAPeriodoPrevisionesNoticiaA3TV3190658074110-80001539504T12VerVerABE10240042304039003201262459004T12VerVerABG12540-5100778300979023--4T12VerVerACS-196200--28472003490-6463088004T12VerVerACX-1832--455500-250-007197604T12VerVerADV1420--115500350011548004T12VerVerALB-29940-------508--4T12VerVerALM7640-93090020310045124004T12VerVerAMA5751018002910007501131107704T12VerVerAMP-24571949034800-1100-0759604T12VerVerANA18940-6277016005603151431004T12VerVerAZK1101750011890-350003--4T12VerVerBAY----97100-840----4T12VerVerBBVA167600-4420----031--4T12VerVerBDL183481008070-22039134704T12VerVerBIO-092-77501629400660-0022279004T12VerVerBKIA-1919300287403153003020-990--4T12VerVerBKT12470-3120----023--4T12VerVerBME13550-127029620-780170197304T12VerVerBVA-36000030586-----101--4T12VerVerCABK23000-7820----024--4T12VerVerCAF9940-3200172100--2916181904T12VerVerCBAV-540--9000-4000199604T12VerVerCDR-10460--1663902110-190305204T12VerVerCIE6100070156250-660051234104T12VerVerCLEO-129035005300-1850132--4T12VerVerCOL-112900--22500-200-420175004T12VerVerCPF1570--191830498-024150504T12VerVerCPL-14710550065370-1290-38669804T12VerVerCUN1027-9193504-451----4T12VerVerDERM1100-59002900-1940-145-11704T12VerVerDIA1579060401167900670024609504T12VerVerDIN2620------11027604T12VerVerEAD1228001900564800015001502186004T12VerVerEBRO158404602041001310107299504T12VerVerECR-121313970066750-120-012677504T12VerVerELE203400-80033933003801927005004T12VerVerENC430040082800030012139004T12VerVerENEL41300120268800640--1678004T12VerVerENG37950410114040400159934304T12VerVerENO8760-2390193100320135263704T12VerVerEZE-1945-510019040-040-00910284T12VerVerFAE195037001761074001021354T12VerVerFCC-102800--1115200-630-707753004T12VerVerFDR1450-39062880080-11572204T12VerVerFER70970-4290768640320051926804T12VerVerFRS-6898-32604460400-05031904T12VerVerFUN100--120303100008--4T12VerVerGALQ6100-500014000-3100--14504T12VerVerGAM-65900--284400-620-018--4T12VerVerGAS144100880249040018201465080004T12VerVerGCO20020-490323680050165--4T12VerVerGRF25670410302620904600--836104T12VerVerGSJ-9900--65800-1250-14987004T12VerVerIAG-92300--15372001390---68004T12VerVerIBE28407013034200008100477726604T12VerVerIBG1740-23802161010017733004T12VerVerIDR13270-2700294100900080249004T12VerVerINSUR-1807--51411960--12304T12VerVerINY-493-36003476-900-0170934T12VerVerITX2361002200159460015003793913004T12VerVerJAZ62002200908602100025172704T12VerVerLGT026-91965590-22000035174T12VerVerMAP66570-31002530120750022--4T12VerVerMCM274018401990041021752814T12VerVerMDF116001630916001440072126304T12VerVerMEL4210030136240200023249504T12VerVerMTBA-2910--880-5260-024--4T12VerVerMTF-58200-03016040-1100-464-7704T12VerVerMTS-274600--6219593-1040--5717964T12VerVerMVC-26930862025780-2610-027121604T12VerVerNAT-440041035500--012--4T12VerVerNEA700--3170-5000-058-4304T12VerVerNHH-29210--131010-340-1185504T12VerVerNTC-6000002993150--0864T12VerVerOHL100550350304029008809661052904T12VerVerOLE-24500--82880-1370--88304T12VerVerPAC1429-65009802030001690054T12VerVerPOP-246100-------023--4T12VerVerPRM9203728866-30405715114T12VerVerPRS-1282--266400-220-061476004T12VerVerPSG172002703669003060028427004T12VerVerQBT-7670-2000361606900-008-11804T12VerVerR454919603700150013--4T12VerVerREE492286901755207203641299104T12VerVerREN36010005250-65000236204T12VerVerREP206000-610595930013201756956004T12VerVerREY-910001427013600-4920-174-709304T12VerVerRIO0741911673390014--4T12VerVerRLIA-31900--21700-2260-007124104T12VerVerROVI19508002019090003927004T12VerVerSAB8190-6470----006--4T12VerVerSAN220500-5880----024--4T12VerVerSED1337017000117400013-36924804T12VerVerSLR-2400-75001690-8380-0246504T12VerVerSNC-2160--12670-1120-009-4504T12VerVerSPS-1820-543020960-410-0296374T12VerVerSTG----35201040-15114404T12VerVerSYV-97700--361370-574-565506004T12VerVerTEC-410--38500-300--4504T12VerVerTEF392800-27306235600-08008821231004T12VerVerTL55014-546088670-121001164904T12VerVerTRE13630090265650150240157004T12VerVerTUB1180224005324094000945784T12VerVerTVX91336304047440-890-07841264T12VerVerURA-4300592062100-800-01856004T12VerVerVER-4060-16609120-3560-0135704T12VerVerVID46506404569055019365304T12VerVerVIS1050038075280129022524604T12VerVerVLG28301730110200280009533204T12VerVerVOC5330-03059660-1350-04314274T12VerVerZEL660390016180-86000320404T12VerVerZOT18100-67080911-121051278004T12&format=json&callback=jsonp136432322904 CARP/91.198.174.43 text/javascript http://www.invertia.com/mercados/bolsa/indices/mdo-continuo/resultados-ib011continu/4T12 - Mozilla/5.0%20(Windows%20NT%206.1)%20AppleWebKit/537.22%20(KHTML,%20like%20Gecko)%20Chrome/25.0.1364.172%20Safari/537.22 es,en-GB;q=0.8,en;q=0.6 - \ No newline at end of file diff --git a/filter.c b/filter.c index 68daf4b..329f522 100644 --- a/filter.c +++ b/filter.c @@ -76,9 +76,9 @@ {"wikiversity",".v",NULL}, {"wikiquote",".q",NULL}, {"m.wikipedia", ".mw", NULL}, - {"wikivoyage", ".voy", NULL}, - {"wikimediafoundation", ".f", NULL}, - {"wikidata", ".wd", NULL}, + {"wikivoyage", ".voy", NULL}, + {"wikimediafoundation", ".f", NULL}, + {"wikidata", ".wd", NULL}, NULL }, *project; @@ -173,10 +173,14 @@ FIELD; /* ??? */ info.ip= FIELD; /* IP address! */ FIELD; /* status */ - info.size= FIELD; /* object size */ + info.size= FIELD; /* object size */ FIELD; - url= FIELD; - replace_space(url); + url= FIELD; + if(!url || + !info.ip || + !info.size ) + continue; + replace_space(url); if (!check_ip(info.ip)) continue; if (!parse_url(url,&info)) diff --git a/test.sh b/test.sh index dc91912..9e1a7e2 100755 --- a/test.sh +++ b/test.sh @@ -1,7 +1,5 @@ #!/bin/bash - TEST_SPACELESS_LINES=`cat entries-with-urls-with-spaces-2013-02-10.txt | ./filter | perl -MData::Dumper -ne '@f=split(/\s/,$_,4); print if $f[3] =~ /\ /;' | wc -l` - if [ $TEST_SPACELESS_LINES -eq 0 ]; then @@ -12,4 +10,13 @@ fi -exit 0; +trap "" SIGSEGV +cat big-entry-1.txt | ./filter >/dev/null 2>/dev/null + +if [ $? -ne 139 ]; then + echo "Test2: Big fields in filter PASSED"; +else + echo "Test2: Big fields in filter FAILED"; +fi + + -- To view, visit https://gerrit.wikimedia.org/r/56902 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63871716ade4cc657720ad42ef03c6fd7741fceb Gerrit-PatchSet: 1 Gerrit-Project: analytics/webstatscollector Gerrit-Branch: master Gerrit-Owner: Stefan.petrea <ste...@garage-coding.com> Gerrit-Reviewer: Ottomata <o...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
