Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
D
Dnsmasq
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
Dnsmasq
Commits
41a8d9e9
Commit
41a8d9e9
authored
Nov 14, 2015
by
Edwin Török
Committed by
Simon Kelley
Nov 14, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix crash when empty address from DNS overlays A record from hosts.
parent
90477fb7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
CHANGELOG
CHANGELOG
+5
-0
src/cache.c
src/cache.c
+1
-1
No files found.
CHANGELOG
View file @
41a8d9e9
...
...
@@ -13,6 +13,11 @@ version 2.76
was a dangling symbolic link, even of --no-resolv set.
Thanks to Alexander Kurtz for spotting the problem.
Fix crash when an A or AAAA record is defined locally,
in a hosts file, and an upstream server sends a reply
that the same name is empty. Thanks to Edwin Török for
the patch.
version 2.75
Fix reversion on 2.74 which caused 100% CPU use when a
...
...
src/cache.c
View file @
41a8d9e9
...
...
@@ -481,7 +481,7 @@ struct crec *cache_insert(char *name, struct all_addr *addr,
existing record is for an A or AAAA and
the record we're trying to insert is the same,
just drop the insert, but don't error the whole process. */
if
((
flags
&
(
F_IPV4
|
F_IPV6
))
&&
(
flags
&
F_FORWARD
))
if
((
flags
&
(
F_IPV4
|
F_IPV6
))
&&
(
flags
&
F_FORWARD
)
&&
addr
)
{
if
((
flags
&
F_IPV4
)
&&
(
new
->
flags
&
F_IPV4
)
&&
new
->
addr
.
addr
.
addr
.
addr4
.
s_addr
==
addr
->
addr
.
addr4
.
s_addr
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment