vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-12 07:49:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: Some configuration data is not stored in the core database when using SQLite.

Browse source 
https://github.com/safing/portmaster/issues/1989
This commit is contained in:
Alexandr Stelnykovych 2025-08-28 17:25:16 +03:00
parent f7a8133f81
commit ce52869945
2 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
base/database/storage/sqlite/sqlite.go
View file

@ -161,13 +161,28 @@ func (db *SQLite) putRecord(r record.Record, tx *bob.Tx) (record.Record, error)
defer r.Unlock()
}
// Serialize to JSON.
data, err := r.MarshalDataOnly(r, dsd.JSON)
// default serialization format - JSON
format := uint8(dsd.JSON)
// For wrapped records, check the required format
if r.IsWrapped() {
wrapper, ok := r.(*record.Wrapper)
if !ok {
return nil, errors.New("record is malformed (reports to be wrapped but is not of type *record.Wrapper)")
}
format, ok = dsd.ValidateSerializationFormat(wrapper.Format)
if !ok {
return nil, dsd.ErrIncompatibleFormat
}
}
// Serialize.
data, err := r.MarshalDataOnly(r, format)
if err != nil {
return nil, err
}
// Prepare for setter.
setFormat := omitnull.From(int16(dsd.JSON))
setFormat := omitnull.From(int16(format))
setData := omitnull.From(data)
if len(data) == 0 {
setFormat.Null()