1 files changed, 4 insertions, 0 deletions

diff --git a/meta/classes/extrausers.bbclass b/meta/classes/extrausers.bbclass
index 8670a2a85a..faf57b108e 100644
--- a/meta/classes/extrausers.bbclass
+++ b/meta/classes/extrausers.bbclass
@@ -54,6 +54,10 @@ set_user_group () {
                                 bbfatal "Invalid command in EXTRA_USERS_PARAMS: $cmd"
                                 ;;
                 esac
+                # Avoid infinite loop if the last parameter doesn't end with ';'
+                if [ "$setting" = "$remaining" ]; then
+                        break
+                fi
                 # iterate to the next setting
                 setting=`echo $remaining | cut -d ';' -f1`
                 remaining=`echo $remaining | cut -d ';' -f2-`