mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-09-11 10:45:42 +03:00
Pull request 2129: 6644-fix-nil-deref
Updates #6644. Co-authored-by: Eugene Burkov <E.Burkov@AdGuard.COM> Squashed commit of the following: commit a79f4a35f811ab85302d266839f55143afc6fff8 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jan 17 19:53:58 2024 +0300 all: upd chlog commit 9106dfb65dcfbbe40a0c97964279e8c35d4c8c00 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jan 17 19:43:34 2024 +0300 home: fix nil deref
This commit is contained in:
parent
df40da7c64
commit
88b05287d7
@ -71,6 +71,7 @@ In this release, the schema version has changed from 27 to 28.
|
|||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
- Panic on using `--no-etc-hosts` flag ([#6644]).
|
||||||
- Schedule display in the client settings after creating or updating.
|
- Schedule display in the client settings after creating or updating.
|
||||||
- Zero value in `querylog.size_memory` disables logging ([#6570]).
|
- Zero value in `querylog.size_memory` disables logging ([#6570]).
|
||||||
- Non-anonymized IP addresses on the dashboard ([#6584]).
|
- Non-anonymized IP addresses on the dashboard ([#6584]).
|
||||||
@ -95,6 +96,7 @@ In this release, the schema version has changed from 27 to 28.
|
|||||||
[#6570]: https://github.com/AdguardTeam/AdGuardHome/issues/6570
|
[#6570]: https://github.com/AdguardTeam/AdGuardHome/issues/6570
|
||||||
[#6574]: https://github.com/AdguardTeam/AdGuardHome/issues/6574
|
[#6574]: https://github.com/AdguardTeam/AdGuardHome/issues/6574
|
||||||
[#6584]: https://github.com/AdguardTeam/AdGuardHome/issues/6584
|
[#6584]: https://github.com/AdguardTeam/AdGuardHome/issues/6584
|
||||||
|
[#6644]: https://github.com/AdguardTeam/AdGuardHome/issues/6644
|
||||||
|
|
||||||
[wiki-config]: https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration
|
[wiki-config]: https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration
|
||||||
|
|
||||||
|
@ -360,6 +360,11 @@ func setupDNSFilteringConf(conf *filtering.Config) (err error) {
|
|||||||
)
|
)
|
||||||
|
|
||||||
conf.EtcHosts = Context.etcHosts
|
conf.EtcHosts = Context.etcHosts
|
||||||
|
// TODO(s.chzhen): Use empty interface.
|
||||||
|
if Context.etcHosts == nil {
|
||||||
|
conf.EtcHosts = nil
|
||||||
|
}
|
||||||
|
|
||||||
conf.ConfigModified = onConfigModified
|
conf.ConfigModified = onConfigModified
|
||||||
conf.HTTPRegister = httpRegister
|
conf.HTTPRegister = httpRegister
|
||||||
conf.DataDir = Context.getDataDir()
|
conf.DataDir = Context.getDataDir()
|
||||||
|
Loading…
Reference in New Issue
Block a user