main-grpc: Fix iterator going invalid at destruction time

Apparently, erase() would make the iterator invalid so we need grab
the next one to have the work correctly.

Bug-AGL: SPEC-5077
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I290fa1231eb6b37ab63c5f5c0bd8fe90d4363a77

1 files changed, 4 insertions, 6 deletions

diff --git a/grpc-proxy/main-grpc.cpp b/grpc-proxy/main-grpc.cpp
index 92d4862..db33032 100644
--- a/grpc-proxy/main-grpc.cpp
+++ b/grpc-proxy/main-grpc.cpp
@@ -272,9 +272,8 @@ global_remove(void *data, struct wl_registry *reg, uint32_t id)
 	(void) id;
 
 	for (std::list<global_data>::iterator it = sh->globals.begin();
-			it != sh->globals.end(); it++) {
-		sh->globals.erase(it);
-	}
+			it != sh->globals.end(); it = sh->globals.erase(it))
+		;
 }
 
 static const struct wl_registry_listener registry_listener = {
@@ -395,9 +394,8 @@ destroy_shell_data(struct shell_data *sh)
                 destroy_output(w_output);
 
        for (std::list<global_data>::iterator it = sh->globals.begin();
-		       it != sh->globals.end(); it++) {
-	       sh->globals.erase(it);
-       }
+		       it != sh->globals.end(); it = sh->globals.erase(it))
+	       ;
 
         wl_display_flush(sh->wl_display);
         wl_display_disconnect(sh->wl_display);