Merge pull request #97 from jostanislas/dev

Fixed issues found in Cycode Vulnerabilities
paypal · May 12, 2023 · 26964d9 · 26964d9
2 parents b3f417f + e459aa5
commit 26964d9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/cmd/dbscanserv/app/scan.go b/cmd/dbscanserv/app/scan.go
@@ -156,11 +156,7 @@ func (s *Scanner) ScanAndMerge(rangeid int, jm *prime.JoinMap, rs *prime.Result)
 	}
 
 	err := s.merge(rangeid, jm, rs)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return err
 }
 
 func (s *Scanner) GetNext(rangeid int, keyList prime.KeyList) *prime.MessageBlock {

diff --git a/cmd/proxy/stats/monhandler.go b/cmd/proxy/stats/monhandler.go
@@ -315,7 +315,8 @@ func (h *HandlerForMonitor) handleQuery(w http.ResponseWriter, urlPath string, v
 			}
 			w.Write([]byte(str))
 		default:
-			w.Write([]byte(fmt.Sprintf("key: %s not supported", key)))
+			// w.Write([]byte(fmt.Sprintf("key: %s not supported", key)))
+			fmt.Fprintf(w, "key: %s not supported", key)
 		}
 	} else {
 		w.Write([]byte("query not supported"))

diff --git a/cmd/proxy/watcher/watcher.go b/cmd/proxy/watcher/watcher.go
@@ -228,10 +228,13 @@ func (w *Watcher) onMarkDownEvent(ev *clientv3.Event) {
 		markdownobj.Reset()
 		return
 	}
-
-	zoneid, _ := strconv.Atoi(string(ev.Kv.Value))
-	glog.Infof("markdown: zoneid=%d", zoneid)
-	markdownobj.MarkDown(int32(zoneid))
+	zoneid, err := strconv.ParseUint(string(ev.Kv.Value), 10, 32)
+	if err == nil {
+		glog.Infof("markdown: zoneid=%d", zoneid)
+		markdownobj.MarkDown(int32(zoneid))
+	} else {
+		glog.Errorf("markdown failed. Error:", err.Error())
+	}
 }
 
 func (w *Watcher) Stop() {