|
 |
ea84b2 |
diff -up kbd-2.4.0/src/libkbdfile/kbdfile.c.orig kbd-2.4.0/src/libkbdfile/kbdfile.c
|
|
|
ea84b2 |
--- kbd-2.4.0/src/libkbdfile/kbdfile.c.orig 2020-11-11 13:44:48.000000000 +0100
|
|
|
ea84b2 |
+++ kbd-2.4.0/src/libkbdfile/kbdfile.c 2021-04-27 09:58:08.405671071 +0200
|
|
|
ea84b2 |
@@ -39,8 +39,10 @@ kbdfile_new(struct kbdfile_ctx *ctx)
|
|
|
ea84b2 |
|
|
|
ea84b2 |
if (!fp->ctx) {
|
|
|
ea84b2 |
fp->ctx = kbdfile_context_new();
|
|
|
ea84b2 |
- if (!fp->ctx)
|
|
|
ea84b2 |
+ if (!fp->ctx) {
|
|
|
ea84b2 |
+ free(fp);
|
|
|
ea84b2 |
return NULL;
|
|
|
ea84b2 |
+ }
|
|
|
ea84b2 |
fp->flags |= KBDFILE_CTX_INITIALIZED;
|
|
|
ea84b2 |
}
|
|
|
ea84b2 |
|
|
|
ea84b2 |
@@ -69,7 +71,7 @@ kbdfile_get_pathname(struct kbdfile *fp)
|
|
|
ea84b2 |
int
|
|
|
ea84b2 |
kbdfile_set_pathname(struct kbdfile *fp, const char *pathname)
|
|
|
ea84b2 |
{
|
|
|
ea84b2 |
- strncpy(fp->pathname, pathname, sizeof(fp->pathname));
|
|
|
ea84b2 |
+ strncpy(fp->pathname, pathname, sizeof(fp->pathname) - 1);
|
|
|
ea84b2 |
return 0;
|
|
|
ea84b2 |
}
|
|
|
ea84b2 |
|
|
|
ea84b2 |
@@ -385,7 +387,7 @@ kbdfile_find(const char *fnam, const cha
|
|
|
ea84b2 |
fp->flags &= ~KBDFILE_PIPE;
|
|
|
ea84b2 |
|
|
|
ea84b2 |
/* Try explicitly given name first */
|
|
|
ea84b2 |
- strncpy(fp->pathname, fnam, sizeof(fp->pathname));
|
|
|
ea84b2 |
+ strncpy(fp->pathname, fnam, sizeof(fp->pathname) - 1);
|
|
|
ea84b2 |
|
|
|
ea84b2 |
if (!maybe_pipe_open(fp))
|
|
|
ea84b2 |
return 0;
|
|
|
ea84b2 |
diff -up kbd-2.4.0/src/libkeymap/common.c.orig kbd-2.4.0/src/libkeymap/common.c
|
|
|
ea84b2 |
--- kbd-2.4.0/src/libkeymap/common.c.orig 2019-06-24 13:55:23.000000000 +0200
|
|
|
ea84b2 |
+++ kbd-2.4.0/src/libkeymap/common.c 2021-04-27 09:58:08.405671071 +0200
|
|
|
ea84b2 |
@@ -139,6 +139,7 @@ init_array(struct lk_ctx *ctx, struct lk
|
|
|
ea84b2 |
rc = lk_array_init(ptr, size, 0);
|
|
|
ea84b2 |
if (rc < 0) {
|
|
|
ea84b2 |
ERR(ctx, _("unable to initialize array: %s"), strerror(rc));
|
|
|
ea84b2 |
+ free(ptr);
|
|
|
ea84b2 |
return -1;
|
|
|
ea84b2 |
}
|
|
|
ea84b2 |
|
|
|
ea84b2 |
diff -up kbd-2.4.0/src/libkfont/psffontop.c.orig kbd-2.4.0/src/libkfont/psffontop.c
|
|
|
ea84b2 |
--- kbd-2.4.0/src/libkfont/psffontop.c.orig 2020-04-27 17:53:01.000000000 +0200
|
|
|
ea84b2 |
+++ kbd-2.4.0/src/libkfont/psffontop.c 2021-04-27 09:59:14.170153676 +0200
|
|
|
ea84b2 |
@@ -235,6 +235,7 @@ kfont_read_psffont(struct kfont_context
|
|
|
ea84b2 |
|
|
|
ea84b2 |
if (psfhdr->mode > PSF1_MAXMODE) {
|
|
|
ea84b2 |
KFONT_ERR(ctx, _("Unsupported psf file mode (%d)"), psfhdr->mode);
|
|
|
ea84b2 |
+ free(psfhdr);
|
|
|
ea84b2 |
return -EX_DATAERR;
|
|
|
ea84b2 |
}
|
|
|
ea84b2 |
fontlen = ((psfhdr->mode & PSF1_MODE512) ? 512 : 256);
|
|
|
ea84b2 |
@@ -251,6 +252,7 @@ kfont_read_psffont(struct kfont_context
|
|
|
ea84b2 |
|
|
|
ea84b2 |
if (psfhdr.version > PSF2_MAXVERSION) {
|
|
|
ea84b2 |
KFONT_ERR(ctx, _("Unsupported psf version (%d)"), psfhdr.version);
|
|
|
ea84b2 |
+ free(inputbuf);
|
|
|
ea84b2 |
return -EX_DATAERR;
|
|
|
ea84b2 |
}
|
|
|
ea84b2 |
fontlen = assemble_uint32((unsigned char *)&psfhdr.length);
|
|
|
ea84b2 |
@@ -260,16 +262,20 @@ kfont_read_psffont(struct kfont_context
|
|
|
ea84b2 |
ftoffset = assemble_uint32((unsigned char *)&psfhdr.headersize);
|
|
|
ea84b2 |
fontwidth = assemble_uint32((unsigned char *)&psfhdr.width);
|
|
|
ea84b2 |
utf8 = 1;
|
|
|
ea84b2 |
- } else
|
|
|
ea84b2 |
+ } else {
|
|
|
ea84b2 |
+ free(inputbuf);
|
|
|
ea84b2 |
return -EX_DATAERR; /* not psf */
|
|
|
ea84b2 |
+ }
|
|
|
ea84b2 |
|
|
|
ea84b2 |
/* tests required - we divide by these */
|
|
|
ea84b2 |
if (fontlen == 0) {
|
|
|
ea84b2 |
KFONT_ERR(ctx, _("zero input font length?"));
|
|
|
ea84b2 |
+ free(inputbuf);
|
|
|
ea84b2 |
return -EX_DATAERR;
|
|
|
ea84b2 |
}
|
|
|
ea84b2 |
if (charsize == 0) {
|
|
|
ea84b2 |
KFONT_ERR(ctx, _("zero input character size?"));
|
|
|
ea84b2 |
+ free(inputbuf);
|
|
|
ea84b2 |
return -EX_DATAERR;
|
|
|
ea84b2 |
}
|
|
|
ea84b2 |
|
|
|
ea84b2 |
@@ -277,6 +283,7 @@ kfont_read_psffont(struct kfont_context
|
|
|
ea84b2 |
|
|
|
ea84b2 |
if (i > inputlth || (!hastable && i != inputlth)) {
|
|
|
ea84b2 |
KFONT_ERR(ctx, _("Input file: bad input length (%d)"), inputlth);
|
|
|
ea84b2 |
+ free(inputbuf);
|
|
|
ea84b2 |
return -EX_DATAERR;
|
|
|
ea84b2 |
}
|
|
|
ea84b2 |
|