kwo pushed a commit to branch master.

http://git.enlightenment.org/e16/e16.git/commit/?id=f188d84406a188de6747f663538c0131ff10a102

commit f188d84406a188de6747f663538c0131ff10a102
Author: Kim Woelders <k...@woelders.dk>
Date:   Sat Mar 20 06:26:36 2021 +0100

    Fix segv on bad border definition
    
    If a border definition was completely empty we would call _BorderCheck()
    with b = NULL.
---
 src/borders.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/borders.c b/src/borders.c
index 886d733b..195d58b4 100644
--- a/src/borders.c
+++ b/src/borders.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various 
contributors
- * Copyright (C) 2004-2020 Kim Woelders
+ * Copyright (C) 2004-2021 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -1324,9 +1324,6 @@ BorderConfigLoad(FILE * fs)
 
        switch (i1)
          {
-         case CONFIG_CLOSE:
-            _BorderCheck(b);
-            goto done;
          case CONFIG_CLASSNAME:
             if (BorderFind(s2))
               {
@@ -1344,6 +1341,9 @@ BorderConfigLoad(FILE * fs)
          {
          default:
             break;
+         case CONFIG_CLOSE:
+            _BorderCheck(b);
+            goto done;
          case BORDER_INIT:
             if (i2 != CONFIG_OPEN)
                break;

-- 


Reply via email to