NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit8130cbc

committed

Clean up md5.c to make it clearer that it is a frontend-and-backend

module. Don't rely on backend palloc semantics; in fact, best to notuse palloc at all, rather than #define'ing it to malloc, because thatjust encourages errors of omission. Bug spotted by Volkan YAZICI,but I went further than he did to fix it.

1 parenta5bd1d3 commit8130cbcCopy full SHA for 8130cbc

File tree

1 file changed

-16

lines changed

src/backend/libpq
- md5.c

1 file changed

-16

lines changed

`‎src/backend/libpq/md5.c`

Lines changed: 8 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,24 +14,13 @@`
`14`	`14`	`*Portions Copyright (c) 1994, Regents of the University of California`
`15`	`15`	`*`
`16`	`16`	`* IDENTIFICATION`
`17`		`- * $PostgreSQL: pgsql/src/backend/libpq/md5.c,v 1.30 2005/10/17 16:24:19 tgl Exp $`
	`17`	`+ * $PostgreSQL: pgsql/src/backend/libpq/md5.c,v 1.31 2005/10/20 13:54:08 tgl Exp $`
`18`	`18`	`*/`
`19`	`19`
	`20`	`+/* This is intended to be used in both frontend and backend, so use c.h */`
	`21`	`+#include"c.h"`
`20`	`22`
`21`		`-#if ! defined(FRONTEND)`
`22`		`-#include"postgres.h"`
`23`	`23`	`#include"libpq/crypt.h"`
`24`		`-#endif`
`25`		`-`
`26`		`-#ifdefFRONTEND`
`27`		`-#include"postgres_fe.h"`
`28`		`-#include"libpq/crypt.h"`
`29`		`-`
`30`		`-#undef palloc`
`31`		`-#definepalloc malloc`
`32`		`-#undef pfree`
`33`		`-#definepfree free`
`34`		`-#endif/* FRONTEND */`
`35`	`24`
`36`	`25`
`37`	`26`	`/*`
`@@ -325,9 +314,12 @@ pg_md5_encrypt(const char passwd, const char salt, size_t salt_len,`
`325`	`314`	`char*buf)`
`326`	`315`	`{`
`327`	`316`	`size_tpasswd_len=strlen(passwd);`
`328`		`-char*crypt_buf=palloc(passwd_len+salt_len);`
	`317`	`+char*crypt_buf=malloc(passwd_len+salt_len);`
`329`	`318`	`boolret;`
`330`	`319`
	`320`	`+if (!crypt_buf)`
	`321`	`+return false;`
	`322`	`+`
`331`	`323`	`/*`
`332`	`324`	`* Place salt at the end because it may be known by users trying to crack`
`333`	`325`	`* the MD5 output.`
`@@ -338,7 +330,7 @@ pg_md5_encrypt(const char passwd, const char salt, size_t salt_len,`
`338`	`330`	`strcpy(buf,"md5");`
`339`	`331`	`ret=pg_md5_hash(crypt_buf,passwd_len+salt_len,buf+3);`
`340`	`332`
`341`		`-pfree(crypt_buf);`
	`333`	`+free(crypt_buf);`
`342`	`334`
`343`	`335`	`returnret;`
`344`	`336`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8130cbc

File tree

1 file changed

1 file changed

`‎src/backend/libpq/md5.c`

0 commit comments