# HG changeset patch # User Carl Byington # Date 1391615678 28800 # Node ID 9bd5388bf469b9a05c4097599be0628c0f2ee804 # Parent 0bc4442e16c1d050c0866fba03cf74742bc37724 Fix possible segfault in mlfi_connect, hostaddr might be null diff -r 0bc4442e16c1 -r 9bd5388bf469 ChangeLog --- a/ChangeLog Tue Dec 31 10:47:39 2013 -0800 +++ b/ChangeLog Wed Feb 05 07:54:38 2014 -0800 @@ -1,3 +1,6 @@ +6.40 2014-02-05 + Fix possible segfault in mlfi_connect, hostaddr might be null. + 6.39 2013-12-31 Fix segfault caused by freeing unallocated memory. diff -r 0bc4442e16c1 -r 9bd5388bf469 NEWS --- a/NEWS Tue Dec 31 10:47:39 2013 -0800 +++ b/NEWS Wed Feb 05 07:54:38 2014 -0800 @@ -1,3 +1,4 @@ +6.40 2014-02-05 Fix possible segfault in mlfi_connect, hostaddr might be null. 6.39 2013-12-31 Fix segfault caused by freeing unallocated memory. 6.38 2013-12-24 Activate check for unique ip connection limits. 6.37 2013-12-17 Add unique ip connection limits per authenticated id or email address. diff -r 0bc4442e16c1 -r 9bd5388bf469 configure.in --- a/configure.in Tue Dec 31 10:47:39 2013 -0800 +++ b/configure.in Wed Feb 05 07:54:38 2014 -0800 @@ -1,6 +1,6 @@ AC_PREREQ(2.59) -AC_INIT(dnsbl,6.39,carl@five-ten-sg.com) +AC_INIT(dnsbl,6.40,carl@five-ten-sg.com) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff -r 0bc4442e16c1 -r 9bd5388bf469 dnsbl.spec.in --- a/dnsbl.spec.in Tue Dec 31 10:47:39 2013 -0800 +++ b/dnsbl.spec.in Wed Feb 05 07:54:38 2014 -0800 @@ -103,6 +103,9 @@ %changelog +* Wed Feb 05 2014 Carl Byington - 6.40-1 +- Fix possible segfault in mlfi_connect, hostaddr might be null. + * Tue Dec 31 2013 Carl Byington - 6.39-1 - Fix segfault caused by freeing unallocated memory. diff -r 0bc4442e16c1 -r 9bd5388bf469 src/dnsbl.cpp --- a/src/dnsbl.cpp Tue Dec 31 10:47:39 2013 -0800 +++ b/src/dnsbl.cpp Wed Feb 05 07:54:38 2014 -0800 @@ -1149,7 +1149,7 @@ { // allocate some private memory mlfiPriv *priv = new mlfiPriv; - if (hostaddr->sa_family == AF_INET) { + if (hostaddr && (hostaddr->sa_family == AF_INET)) { priv->ip = ((struct sockaddr_in *)hostaddr)->sin_addr.s_addr; } // save the private data @@ -1234,6 +1234,7 @@ // some version of sendmail allowed rcpt to:<> and passed it thru to the milters if (strcmp(loto, "<>") == 0) { smfi_setreply(ctx, (char*)"550", (char*)"5.7.1", (char*)"bogus recipient"); + free((void*)loto); // cppcheck static analysis found memory leak return SMFIS_REJECT; } // priv.mailaddr sending original message to loto diff -r 0bc4442e16c1 -r 9bd5388bf469 tld.conf --- a/tld.conf Tue Dec 31 10:47:39 2013 -0800 +++ b/tld.conf Wed Feb 05 07:54:38 2014 -0800 @@ -1,4 +1,4 @@ -// generated by make-tld-conf.py on 2013-12-24 08:10:29 +// generated by make-tld-conf.py on 2014-01-27 09:16:12 // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -190,6 +190,7 @@ // arpa : http://en.wikipedia.org/wiki/.arpa // Confirmed by registry 2008-06-18 +arpa e164.arpa in-addr.arpa ip6.arpa @@ -214,6 +215,7 @@ // au : http://en.wikipedia.org/wiki/.au // http://www.auda.org.au/ +au // 2LDs com.au net.au @@ -492,6 +494,7 @@ // bv : No registrations at this time. // Submitted by registry 2006-06-16 +bv // bw : http://en.wikipedia.org/wiki/.bw // http://www.gobin.info/domainname/bw.doc @@ -874,6 +877,7 @@ // gb : This registry is effectively dormant // Submitted by registry 2008-06-12 +gb // gd : http://en.wikipedia.org/wiki/.gd gd @@ -927,6 +931,7 @@ // gn : http://psg.com/dns/gn/gn.txt // Submitted by registry 2008-06-17 +gn ac.gn com.gn edu.gn @@ -3324,6 +3329,7 @@ gov.kn // kp : http://www.kcce.kp/en_index.php +kp com.kp edu.kp gov.kp @@ -3401,6 +3407,7 @@ // lb : http://en.wikipedia.org/wiki/.lb // Submitted by registry 2008-06-17 +lb com.lb edu.lb gov.lb @@ -3439,6 +3446,7 @@ // lr : http://psg.com/dns/lr/lr.txt // Submitted by registry 2008-06-17 +lr com.lr edu.lr gov.lr @@ -5894,6 +5902,7 @@ // sj : No registrations at this time. // Submitted by registry 2008-06-16 +sj // sk : http://en.wikipedia.org/wiki/.sk // list of 2nd level domains ? @@ -6076,6 +6085,10 @@ edu.to mil.to +// tp : No registrations at this time. +// Submitted by Ryan Sleevi 2014-01-03 +tp + // tr : http://en.wikipedia.org/wiki/.tr *.tr !nic.tr @@ -6132,6 +6145,7 @@ // tz : http://www.tznic.or.tz/index.php/domains // Confirmed by registry 2013-01-22 +tz ac.tz co.tz go.tz @@ -6693,6 +6707,10 @@ // 한국 xn--3e0b707e +// xn--80ao21a ("Kaz" Kazakh) : KZ +// қаз +xn--80ao21a + // xn--fzc2c9e2c ("Lanka" Sinhalese-Sinhala) : LK // http://nic.lk // ලංකා @@ -6707,6 +6725,14 @@ // المغرب xn--mgbc0a9azcg +// xn--l1acc ("mon" Mongolian) : MN +// мон +xn--l1acc + +// xn--mgbx4cd0ab ("Malaysia" Malay) : MY +// مليسيا +xn--mgbx4cd0ab + // xn--mgb9awbf ("Oman" Arabic) : OM // عمان xn--mgb9awbf @@ -7004,38 +7030,6 @@ // 中信 xn--fiq64b -// wed : 2013-10-02 Atgron, Inc. -wed - -// pink : 2013-10-02 Afilias Limited -pink - -// ruhr : 2013-10-02 regiodot GmbH & Co. KG -ruhr - -// buzz : 2013-10-03 DOTSTRATEGY CO. -buzz - -// careers : 2013-10-03 Wild Corner, LLC -careers - -// shoes : 2013-10-03 Binky Galley, LLC -shoes - -// xn--4gbrim : 2013-10-07 Suhub Electronic Establishment -// موقع -xn--4gbrim - -// career : 2013-10-09 dotCareer, LLC -career - -// otsuka : 2013-10-11 Otsuka Holdings Co. Ltd. -otsuka - -// xn--fiQ64b : 2013-10-14 CITIC Group Corporation -// 中信 -xn--fiq64b - // gift : 2013-10-18 Uniregistry Corp. gift @@ -7216,6 +7210,397 @@ // moe : 2013-11-13 Interlink Co., Ltd. moe +// guitars : 2013-11-14 Uniregistry, Corp. +guitars + +// bargains : 2013-11-14 Half Hallow, LLC +bargains + +// xn--nqv7fs00ema : 2013-11-14 Public Interest Registry +// 组织机构 +xn--nqv7fs00ema + +// desi : 2013-11-14 Desi Networks LLC +desi + +// cool : 2013-11-14 Koko Lake, LLC +cool + +// boutique : 2013-11-14 Over Galley, LLC +boutique + +// pics : 2013-11-14 Uniregistry, Corp. +pics + +// xn--c1avg : 2013-11-14 Public Interest Registry +// орг +xn--c1avg + +// xn--55qx5d : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences (China Internet Network Information Center) +// 公司 +xn--55qx5d + +// xn--io0a7i : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences (China Internet Network Information Center) +// 网络 +xn--io0a7i + +// cheap : 2013-11-14 Sand Cover, LLC +cheap + +// xn--xhq521b : 2013-11-14 Guangzhou YU Wei Information Technology Co., Ltd. +// 广东 +xn--xhq521b + +// photo : 2013-11-14 Uniregistry, Corp. +photo + +// network : 2013-11-14 Trixy Manor, LLC +network + +// zone : 2013-11-14 Outer Falls, LLC +zone + +// xn--nqv7f : 2013-11-14 Public Interest Registry +// 机构 +xn--nqv7f + +// link : 2013-11-14 Uniregistry, Corp. +link + +// QPON : 2013-11-14 dotCOOL, Inc. +qpon + +// xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry +// संगठन +xn--i1b6b1a6a2e + +// agency : 2013-11-14 Steel Falls, LLC +agency + +// tienda : 2013-11-14 Victor Manor, LLC +tienda + +// works : 2013-11-14 Little Dynamite, LLC +works + +// london : 2013-11-14 Dot London Domains Limited +london + +// watch : 2013-11-14 Sand Shadow, LLC +watch + +// rocks : 2013-11-14 Ruby Moon, LLC +rocks + +// SHIKSHA : 2013-11-14 Afilias Limited +shiksha + +// xn--d1acj3b : 2013-11-21 The Foundation for Network Initiatives “The Smart Internet” +// дети +xn--d1acj3b + +// budapest : 2013-11-21 Top Level Domain Holdings Limited +budapest + +// nrw : 2013-11-21 Minds + Machines GmbH +nrw + +// VOTE : 2013-11-21 Monolith Registry LLC +vote + +// fishing : 2013-11-21 Top Level Domain Holdings Limited +fishing + +// expert : 2013-11-21 Magic Pass, LLC +expert + +// horse : 2013-11-21 Top Level Domain Holdings Limited +horse + +// christmas : 2013-11-21 Uniregistry, Corp. +christmas + +// cooking : 2013-11-21 Top Level Domain Holdings Limited +cooking + +// xn--czru2d : 2013-11-21 Zodiac Capricorn Limited +// 商城 +xn--czru2d + +// casa : 2013-11-21 Top Level Domain Holdings Limited +casa + +// rich : 2013-11-21 I-REGISTRY Ltd., Niederlassung Deutschland +rich + +// VOTO : 2013-11-21 Monolith Registry LLC +voto + +// tools : 2013-11-21 Pioneer North, LLC +tools + +// xn--45q11c : 2013-11-21 Zodiac Scorpio Limited +// 八卦 +xn--45q11c + +// praxi : 2013-12-05 Praxi S.p.A. +praxi + +// events : 2013-12-05 Pioneer Maple, LLC +events + +// flights : 2013-12-05 Fox Station, LLC +flights + +// report : 2013-12-05 Binky Glen, LLC +report + +// partners : 2013-12-05 Magic Glen, LLC +partners + +// neustar : 2013-12-05 NeuStar, Inc. +neustar + +// rentals : 2013-12-05 Big Hollow,LLC +rentals + +// catering : 2013-12-05 New Falls. LLC +catering + +// community : 2013-12-05 Fox Orchard, LLC +community + +// maison : 2013-12-05 Victor Frostbite, LLC +maison + +// parts : 2013-12-05 Sea Goodbye, LLC +parts + +// cleaning : 2013-12-05 Fox Shadow, LLC +cleaning + +// okinawa : 2013-12-05 BusinessRalliart inc. +okinawa + +// foundation : 2013-12-05 John Dale, LLC +foundation + +// properties : 2013-12-05 Big Pass, LLC +properties + +// vacations : 2013-12-05 Atomic Tigers, LLC +vacations + +// productions : 2013-12-05 Magic Birch, LLC +productions + +// industries : 2013-12-05 Outer House, LLC +industries + +// haus : 2013-12-05 Pixie Edge, LLC +haus + +// vision : 2013-12-05 Koko Station, LLC +vision + +// mormon : 2013-12-05 IRI Domain Management, LLC (""Applicant"") +mormon + +// cards : 2013-12-05 Foggy Hollow, LLC +cards + +// ink : 2013-12-05 Top Level Design, LLC +ink + +// villas : 2013-12-05 New Sky, LLC +villas + +// consulting : 2013-12-05 Pixie Station, LLC +consulting + +// cruises : 2013-12-05 Spring Way, LLC +cruises + +// krd : 2013-12-05 KRG Department of Information Technology +krd + +// xyz : 2013-12-05 XYZ.COM LLC +xyz + +// dating : 2013-12-05 Pine Fest, LLC +dating + +// exposed : 2013-12-05 Victor Beach, LLC +exposed + +// condos : 2013-12-05 Pine House, LLC +condos + +// eus : 2013-12-12 Puntueus Fundazioa +eus + +// Caravan : 2013-12-12 Caravan International, Inc. +caravan + +// actor : 2013-12-12 United TLD Holdco Ltd. +actor + +// saarland : 2013-12-12 dotSaarland GmbH +saarland + +// yokohama : 2013-12-12 GMO Registry, Inc. +yokohama + +// pub : 2013-12-12 United TLD Holdco Ltd. +pub + +// xn--p1acf : 2013-12-12 Rusnames Limited +// рус +xn--p1acf + +// ren : 2013-12-12 Beijing Qianxiang Wangjing Technology Development Co., Ltd. +ren + +// fish : 2013-12-12 Fox Woods, LLC +fish + +// BAR : 2013-12-12 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable +bar + +// DNP : 2013-12-13 Dai Nippon Printing Co., Ltd. +dnp + +// bid : 2013-12-19 dot Bid Limited +bid + +// supply : 2013-12-19 Half Falls, LLC +supply + +// Miami : 2013-12-19 Top Level Domain Holdings Limited +miami + +// supplies : 2013-12-19 Atomic Fields, LLC +supplies + +// quebec : 2013-12-19 PointQuébec Inc +quebec + +// MOSCOW : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) +moscow + +// globo : 2013-12-19 Globo Comunicação e Participações S.A +globo + +// AXA : 2013-12-19 AXA SA +axa + +// xn--80adxhks : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) +// москва +xn--80adxhks + +// xn--czrs0t : 2013-12-19 Wild Island, LLC +// 商店 +xn--czrs0t + +// vodka : 2013-12-19 Top Level Domain Holdings Limited +vodka + +// REST : 2013-12-19 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable +rest + +// frogans : 2013-12-19 OP3FT +frogans + +// WTC : 2013-12-19 World Trade Centers Association, Inc. +wtc + +// rodeo : 2013-12-19 Top Level Domain Holdings Limited +rodeo + +// sohu : 2013-12-19 Sohu.com Limited +sohu + +// BEST : 2013-12-19 BestTLD Pty Ltd +best + +// country : 2013-12-19 Top Level Domain Holdings Limited +country + +// KRED : 2013-12-19 KredTLD Pty Ltd +kred + +// feedback : 2013-12-19 Top Level Spectrum, Inc. +feedback + +// work : 2013-12-19 Top Level Domain Holdings Limited +work + +// luxe : 2014-01-09 Top Level Domain Holdings Limited +luxe + +// ryukyu : 2014-01-09 BusinessRalliart inc. +ryukyu + +// autos : 2014-01-09 DERAutos, LLC +autos + +// homes : 2014-01-09 DERHomes, LLC +homes + +// jetzt : 2014-01-09 New TLD Company AB +jetzt + +// yachts : 2014-01-09 DERYachts, LLC +yachts + +// motorcycles : 2014-01-09 DERMotorcycles, LLC +motorcycles + +// mini : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft +mini + +// ggee : 2014-01-09 GMO Internet, Inc. +ggee + +// beer : 2014-01-09 Top Level Domain Holdings Limited +beer + +// xn--1qqw23a : 2014-01-13 Guangzhou YU Wei Information Technology Co., Ltd. +// 佛山 +xn--1qqw23a + +// college : 2014-01-16 XYZ.COM LLC +college + +// ovh : 2014-01-16 OVH SAS +ovh + +// meet : 2014-01-16 Afilias Limited +meet + +// xn--ses554g : 2014-01-16 HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY. HONGKONG LIMITED +// 网址 +xn--ses554g + +// gop : 2014-01-16 Republican State Leadership Committee, Inc. +gop + +// blackfriday : 2014-01-16 Uniregistry, Corp. +blackfriday + +// lacaixa : 2014-01-16 CAIXA D'ESTALVIS I PENSIONS DE BARCELONA +lacaixa + +// xn--czr694b : 2014-01-16 HU YI GLOBAL INFORMATION RESOURCES(HOLDING) COMPANY.HONGKONG LIMITED +// 商标 +xn--czr694b + +// vegas : 2014-01-16 Dot Vegas, Inc. +vegas + +// black : 2014-01-16 Afilias Limited +black + // ===END ICANN DOMAINS=== // ===BEGIN PRIVATE DOMAINS===