summaryrefslogtreecommitdiff
path: root/xc/programs
diff options
context:
space:
mode:
authordpw <empty>1995-05-18 19:25:19 +0000
committerdpw <empty>1995-05-18 19:25:19 +0000
commit5ce3b29d1bbd83e665004714ca011d43a2f1e8e7 (patch)
treedf143dd8964da63d6da6dc3fdc85a438a422d888 /xc/programs
parente9d342885d869e5bae98284621a55aa7815c54f8 (diff)
fix XBUG 6328: memory leak with XListFontsWithInfo
Diffstat (limited to 'xc/programs')
-rw-r--r--xc/programs/Xserver/dix/dixfonts.c4
-rw-r--r--xc/programs/xfs/difs/fonts.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/xc/programs/Xserver/dix/dixfonts.c b/xc/programs/Xserver/dix/dixfonts.c
index 694b51a0a..add06ac68 100644
--- a/xc/programs/Xserver/dix/dixfonts.c
+++ b/xc/programs/Xserver/dix/dixfonts.c
@@ -21,7 +21,7 @@ SOFTWARE.
************************************************************************/
-/* $XConsortium: dixfonts.c,v 1.51 94/08/02 17:41:45 dpw Exp dpw $ */
+/* $XConsortium: dixfonts.c,v 1.52 95/01/03 14:32:35 dpw Exp $ */
#define NEED_REPLIES
#include "X.h"
@@ -992,7 +992,7 @@ doListFontsWithInfo(client, c)
c->current = c->saved;
}
}
- if (c->current.max_names == 0)
+ else if (c->current.max_names == 0)
break;
}
else if (err == Successful)
diff --git a/xc/programs/xfs/difs/fonts.c b/xc/programs/xfs/difs/fonts.c
index 3ccadd756..3bad895be 100644
--- a/xc/programs/xfs/difs/fonts.c
+++ b/xc/programs/xfs/difs/fonts.c
@@ -1,4 +1,4 @@
-/* $XConsortium: fonts.c,v 1.24 94/03/21 13:50:11 gildea Exp $ */
+/* $XConsortium: fonts.c,v 1.25 94/04/17 19:56:15 gildea Exp $ */
/*
* font control
*/
@@ -1218,7 +1218,7 @@ do_list_fonts_with_info(client, c)
c->current = c->saved;
}
}
- if (c->current.max_names == 0)
+ else if (c->current.max_names == 0)
break;
} else if (err == Successful) {
/* XXX why is it xFontProp ? */