Commit149d13d

committed

When given oversized key, encrypt/decrypt corrupted

memory. This fixes it. Also a free() was missing.marko

1 parent7e16f3c commit149d13dCopy full SHA for 149d13d

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF`
`27`	`27`	`* SUCH DAMAGE.`
`28`	`28`	`*`
`29`		`- * $Id: px.c,v 1.3 2001/10/25 05:49:20 momjian Exp $`
	`29`	`+ * $Id: px.c,v 1.4 2001/11/08 15:56:58 momjian Exp $`
`30`	`30`	`*/`
`31`	`31`
`32`	`32`	`#include<postgres.h>`
`@@ -88,6 +88,8 @@ combo_init(PX_Combo * cx, const uint8 *key, uint klen,`
`88`	`88`	`memcpy(ivbuf,iv,ivlen);`
`89`	`89`	`}`
`90`	`90`
	`91`	`+if (klen>ks)`
	`92`	`+klen=ks;`
`91`	`93`	`keybuf=px_alloc(ks);`
`92`	`94`	`memset(keybuf,0,ks);`
`93`	`95`	`memcpy(keybuf,key,klen);`
`@@ -96,6 +98,7 @@ combo_init(PX_Combo * cx, const uint8 *key, uint klen,`
`96`	`98`
`97`	`99`	`if (ivbuf)`
`98`	`100`	`px_free(ivbuf);`
	`101`	`+px_free(keybuf);`
`99`	`102`
`100`	`103`	`returnerr;`
`101`	`104`	`}`

Comments

(0)