Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1343)

Unified Diff: service/datastore/datastore.go

Issue 1523943002: Fix nil-deref panic from Put. (Closed) Base URL: https://github.com/luci/gae.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | service/datastore/datastore_test.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: service/datastore/datastore.go
diff --git a/service/datastore/datastore.go b/service/datastore/datastore.go
index 3b05f392b8b336ec7e1df474475641be8f881b12..6c6017a401def291352dac4ce767f0aeee87520c 100644
--- a/service/datastore/datastore.go
+++ b/service/datastore/datastore.go
@@ -308,10 +308,9 @@ func (d *datastoreImpl) PutMulti(src interface{}) error {
lme := errors.NewLazyMultiError(len(keys))
i := 0
err = d.RawInterface.PutMulti(keys, vals, func(key *Key, err error) error {
- if key != keys[i] {
+ if !lme.Assign(i, err) && key != keys[i] {
mat.setKey(slice.Index(i), key)
}
- lme.Assign(i, err)
i++
return nil
})
« no previous file with comments | « no previous file | service/datastore/datastore_test.go » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698