diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
| commit | 5bfc376d1cee0f941657a771b87a3ee030d31c56 (patch) | |
| tree | de739c3845aa3f5bb9cb4bb79236551d5f3fc8b5 /src/utils/base64.cpp | |
| parent | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (diff) | |
| parent | d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (diff) | |
| download | manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.gz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.bz2 manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.xz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/utils/base64.cpp')
| -rw-r--r-- | src/utils/base64.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp index c0a87533..342c39b0 100644 --- a/src/utils/base64.cpp +++ b/src/utils/base64.cpp @@ -89,8 +89,8 @@ unsigned char *php_base64_decode(const unsigned char *str, int length, int *ret_ } result = (unsigned char *)malloc(length + 1); - if (result == NULL) { - return NULL; + if (result == nullptr) { + return nullptr; } /* run through the whole string, converting as we go */ @@ -135,7 +135,7 @@ unsigned char *php_base64_decode(const unsigned char *str, int length, int *ret_ case 0: case 1: free(result); - return NULL; + return nullptr; case 2: k++; case 3: |