vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-06 05:30:57 +00:00
Code Issues Projects Releases Wiki Activity

Don't use shared encodeBuffer, not safe for API mode.

Browse Source
This commit is contained in:
Andrey Smirnov
2015-03-30 23:59:00 +03:00
parent d791aa0f15
commit ee3d414ed5
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deb/package_collection.go
+15 -14
View File
@@ -10,9 +10,8 @@ import (
// PackageCollection does management of packages in DB
type PackageCollection struct {
db database.Storage
encodeBuffer bytes.Buffer
codecHandle *codec.MsgpackHandle
db database.Storage
codecHandle *codec.MsgpackHandle
}
// Verify interface
@@ -163,43 +162,45 @@ func (collection *PackageCollection) loadFiles(p *Package) *PackageFiles {
// Update adds or updates information about package in DB checking for conficts first
func (collection *PackageCollection) Update(p *Package) error {
encoder := codec.NewEncoder(&collection.encodeBuffer, collection.codecHandle)
var encodeBuffer bytes.Buffer
collection.encodeBuffer.Reset()
collection.encodeBuffer.WriteByte(0xc1)
collection.encodeBuffer.WriteByte(0x1)
encoder := codec.NewEncoder(&encodeBuffer, collection.codecHandle)
encodeBuffer.Reset()
encodeBuffer.WriteByte(0xc1)
encodeBuffer.WriteByte(0x1)
err := encoder.Encode(p)
if err != nil {
return err
}
err = collection.db.Put(p.Key(""), collection.encodeBuffer.Bytes())
err = collection.db.Put(p.Key(""), encodeBuffer.Bytes())
if err != nil {
return err
}
// Encode offloaded fields one by one
if p.files != nil {
collection.encodeBuffer.Reset()
encodeBuffer.Reset()
err = encoder.Encode(*p.files)
if err != nil {
return err
}
err = collection.db.Put(p.Key("xF"), collection.encodeBuffer.Bytes())
err = collection.db.Put(p.Key("xF"), encodeBuffer.Bytes())
if err != nil {
return err
}
}
if p.deps != nil {
collection.encodeBuffer.Reset()
encodeBuffer.Reset()
err = encoder.Encode(*p.deps)
if err != nil {
return err
}
err = collection.db.Put(p.Key("xD"), collection.encodeBuffer.Bytes())
err = collection.db.Put(p.Key("xD"), encodeBuffer.Bytes())
if err != nil {
return err
}
@@ -208,13 +209,13 @@ func (collection *PackageCollection) Update(p *Package) error {
}
if p.extra != nil {
collection.encodeBuffer.Reset()
encodeBuffer.Reset()
err = encoder.Encode(*p.extra)
if err != nil {
return err
}
err = collection.db.Put(p.Key("xE"), collection.encodeBuffer.Bytes())
err = collection.db.Put(p.Key("xE"), encodeBuffer.Bytes())
if err != nil {
return err
}