Merge pull request #877 from hzxuzhonghu/improve-map-op

Prevent potential panic when object is nil or empty

Author: kmesh-bot

pkg/cache/v2/maps/authz.go

@@ -31,6 +31,9 @@ import (
 
 func authorizationToGolang(goMsg *security_v2.Authorization, cMsg *C.Istio__Security__Authorization) error {
 	buf := make([]byte, C.istio__security__authorization__get_packed_size(cMsg))
+	if len(buf) == 0 {
+		return nil
+	}
 
 	C.istio__security__authorization__pack(cMsg, convertToPack(buf))
 	if err := proto.Unmarshal(buf, goMsg); err != nil {
@@ -45,6 +48,10 @@ func authorizationToClang(goMsg *security_v2.Authorization) (*C.Istio__Security_
 		return nil, err
 	}
 
+	if len(buf) == 0 {
+		return nil, nil
+	}
+
 	cMsg := C.istio__security__authorization__unpack(nil, C.size_t(len(buf)), convertToPack(buf))
 	if cMsg == nil {
 		return nil, fmt.Errorf("istio__security__authorization__unpack failed")

pkg/cache/v2/maps/cluster.go

@@ -34,6 +34,9 @@ import (
 
 func clusterToGolang(goMsg *cluster_v2.Cluster, cMsg *C.Cluster__Cluster) error {
 	buf := make([]byte, C.cluster__cluster__get_packed_size(cMsg))
+	if len(buf) == 0 {
+		return nil
+	}
 
 	C.cluster__cluster__pack(cMsg, convertToPack(buf))
 	if err := proto.Unmarshal(buf, goMsg); err != nil {
@@ -47,6 +50,9 @@ func clusterToClang(goMsg *cluster_v2.Cluster) (*C.Cluster__Cluster, error) {
 	if err != nil {
 		return nil, err
 	}
+	if len(buf) == 0 {
+		return nil, nil
+	}
 
 	cMsg := C.cluster__cluster__unpack(nil, C.size_t(len(buf)), convertToPack(buf))
 	if cMsg == nil {
@@ -86,6 +92,9 @@ func ClusterUpdate(key string, value *cluster_v2.Cluster) error {
 	if err != nil {
 		return fmt.Errorf("ClusterUpdate %s", err)
 	}
+	if cMsg == nil {
+		return nil
+	}
 	defer clusterFreeClang(cMsg)
 
 	testString(key, cKey)

pkg/cache/v2/maps/common.go

@@ -39,6 +39,9 @@ func convertToPack(buf []byte) *C.uint8_t {
 
 func socketAddressToGolang(goMsg *core_v2.SocketAddress, cMsg *C.Core__SocketAddress) error {
 	buf := make([]byte, C.core__socket_address__get_packed_size(cMsg))
+	if len(buf) == 0 {
+		return nil
+	}
 
 	C.core__socket_address__pack(cMsg, convertToPack(buf))
 	if err := proto.Unmarshal(buf, goMsg); err != nil {
@@ -52,7 +55,9 @@ func socketAddressToClang(goMsg *core_v2.SocketAddress) (*C.Core__SocketAddress,
 	if err != nil {
 		return nil, err
 	}
-
+	if len(buf) == 0 {
+		return nil, nil
+	}
 	cMsg := C.core__socket_address__unpack(nil, C.size_t(len(buf)), convertToPack(buf))
 	if cMsg == nil {
 		return nil, fmt.Errorf("core__socket_address__unpack failed")

pkg/cache/v2/maps/listener.go

@@ -12,9 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
-
- * Author: LemmyHuang
- * Create: 2022-02-28
  */
 
 package maps
@@ -40,6 +37,9 @@ var (
 
 func listenerToGolang(goMsg *listener_v2.Listener, cMsg *C.Listener__Listener) error {
 	buf := make([]byte, C.listener__listener__get_packed_size(cMsg))
+	if len(buf) == 0 {
+		return nil
+	}
 
 	C.listener__listener__pack(cMsg, convertToPack(buf))
 	if err := proto.Unmarshal(buf, goMsg); err != nil {
@@ -53,6 +53,9 @@ func listenerToClang(goMsg *listener_v2.Listener) (*C.Listener__Listener, error)
 	if err != nil {
 		return nil, err
 	}
+	if len(buf) == 0 {
+		return nil, nil
+	}
 
 	cMsg := C.listener__listener__unpack(nil, C.size_t(len(buf)), convertToPack(buf))
 	if cMsg == nil {
@@ -72,6 +75,9 @@ func ListenerLookup(key *core_v2.SocketAddress, value *listener_v2.Listener) err
 	if err != nil {
 		return fmt.Errorf("ListenerLookup %s", err)
 	}
+	if cKey == nil {
+		return nil
+	}
 	defer socketAddressFreeClang(cKey)
 
 	desc := cKey.base.descriptor
@@ -96,12 +102,18 @@ func ListenerUpdate(key *core_v2.SocketAddress, value *listener_v2.Listener) err
 	if err != nil {
 		return fmt.Errorf("ListenerLookup %s", err)
 	}
+	if cKey == nil {
+		return nil
+	}
 	defer socketAddressFreeClang(cKey)
 
 	cMsg, err := listenerToClang(value)
 	if err != nil {
 		return fmt.Errorf("ListenerUpdate %s", err)
 	}
+	if cMsg == nil {
+		return nil
+	}
 	defer listenerFreeClang(cMsg)
 
 	testSocketAddress(key, cKey)
@@ -125,6 +137,9 @@ func ListenerDelete(key *core_v2.SocketAddress) error {
 	if err != nil {
 		return fmt.Errorf("ListenerLookup %s", err)
 	}
+	if cKey == nil {
+		return nil
+	}
 	defer socketAddressFreeClang(cKey)
 
 	desc := cKey.base.descriptor

pkg/cache/v2/maps/route.go

@@ -12,9 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
-
- * Author: LemmyHuang
- * Create: 2022-03-01
  */
 
 package maps
@@ -34,6 +31,9 @@ import (
 
 func routeConfigToGolang(goMsg *route_v2.RouteConfiguration, cMsg *C.Route__RouteConfiguration) error {
 	buf := make([]byte, C.route__route_configuration__get_packed_size(cMsg))
+	if len(buf) == 0 {
+		return nil
+	}
 
 	C.route__route_configuration__pack(cMsg, convertToPack(buf))
 	if err := proto.Unmarshal(buf, goMsg); err != nil {
@@ -47,6 +47,9 @@ func routeConfigToClang(goMsg *route_v2.RouteConfiguration) (*C.Route__RouteConf
 	if err != nil {
 		return nil, err
 	}
+	if len(buf) == 0 {
+		return nil, nil
+	}
 
 	cMsg := C.route__route_configuration__unpack(nil, C.size_t(len(buf)), convertToPack(buf))
 	if cMsg == nil {
@@ -86,6 +89,9 @@ func RouteConfigUpdate(key string, value *route_v2.RouteConfiguration) error {
 	if err != nil {
 		return fmt.Errorf("RouteConfigUpdate %s", err)
 	}
+	if cMsg == nil {
+		return nil
+	}
 	defer routeConfigFreeClang(cMsg)
 
 	testString(key, cKey)